mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-02-01 22:45:33 +00:00
Fix bad rebase
This commit is contained in:
parent
1357bba0a0
commit
a19db73eca
1 changed files with 2 additions and 2 deletions
|
@ -654,12 +654,12 @@ namespace MWPhysics
|
||||||
{
|
{
|
||||||
if (movementItem.first == ptr)
|
if (movementItem.first == ptr)
|
||||||
{
|
{
|
||||||
movementItem.second = movement;
|
movementItem.second = velocity;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mMovementQueue.emplace_back(ptr, movement);
|
mMovementQueue.emplace_back(ptr, velocity);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PhysicsSystem::clearQueuedMovement()
|
void PhysicsSystem::clearQueuedMovement()
|
||||||
|
|
Loading…
Reference in a new issue