mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-22 21:40:42 +00:00
Fix bad rebase
This commit is contained in:
parent
1357bba0a0
commit
a19db73eca
@ -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…
x
Reference in New Issue
Block a user