[Sync] Some project sync

This commit is contained in:
Antz 2014-10-13 15:25:39 +01:00 committed by Antz
parent b25fa433fe
commit bbf0020c1a
98 changed files with 5866 additions and 2121 deletions

View file

@ -42,9 +42,9 @@ namespace Movement
else if (moveFlags & MOVEFLAG_SWIMMING)
{
if (moveFlags & MOVEFLAG_BACKWARD /*&& speed_obj.swim >= speed_obj.swim_back*/)
return MOVE_SWIM_BACK;
{ return MOVE_SWIM_BACK; }
else
return MOVE_SWIM;
{ return MOVE_SWIM; }
}
else if (moveFlags & MOVEFLAG_WALK_MODE)
{
@ -52,7 +52,7 @@ namespace Movement
return MOVE_WALK;
}
else if (moveFlags & MOVEFLAG_BACKWARD /*&& speed_obj.run >= speed_obj.run_back*/)
return MOVE_RUN_BACK;
{ return MOVE_RUN_BACK; }
return MOVE_RUN;
}