mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-20 07:23:53 +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)
|
||||
{
|
||||
movementItem.second = movement;
|
||||
movementItem.second = velocity;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
mMovementQueue.emplace_back(ptr, movement);
|
||||
mMovementQueue.emplace_back(ptr, velocity);
|
||||
}
|
||||
|
||||
void PhysicsSystem::clearQueuedMovement()
|
||||
|
|
Loading…
Reference in a new issue