From b1c4f5de1f9dfcb6e5d52e0a39b06b116698abe6 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 16 Dec 2022 15:08:31 +0800 Subject: [PATCH] 1 --- server/gameserver/human.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index e527577e..7a56c953 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -2074,16 +2074,19 @@ void Human::_InternalUpdateMove(float speed) } } } + #if 0 if (a8::HasBitFlag(status, CS_Collisioning)) { SetPos(old_pos); return; } + #endif // 999 #if 1 #else SetPos(old_pos + a8::Vec2(nx, 0)); #endif + #if 0 if (CheckCollision()) { if (a8::HasBitFlag(status, CS_Collisioning)) { SetPos(old_pos); @@ -2097,12 +2100,14 @@ void Human::_InternalUpdateMove(float speed) #endif nx = 0; } + #endif // 999 #if 1 #else SetPos(old_pos + a8::Vec2(nx, ny)); #endif + #if 0 if (CheckCollision()) { if (a8::HasBitFlag(status, CS_Collisioning)) { SetPos(old_pos); @@ -2116,6 +2121,7 @@ void Human::_InternalUpdateMove(float speed) #endif ny = 0; } + #endif // 999 #if 1 #else