This commit is contained in:
aozhiwei 2022-12-16 15:08:31 +08:00
parent a05f3cf924
commit b1c4f5de1f

View File

@ -2074,16 +2074,19 @@ void Human::_InternalUpdateMove(float speed)
} }
} }
} }
#if 0
if (a8::HasBitFlag(status, CS_Collisioning)) { if (a8::HasBitFlag(status, CS_Collisioning)) {
SetPos(old_pos); SetPos(old_pos);
return; return;
} }
#endif
// 999 // 999
#if 1 #if 1
#else #else
SetPos(old_pos + a8::Vec2(nx, 0)); SetPos(old_pos + a8::Vec2(nx, 0));
#endif #endif
#if 0
if (CheckCollision()) { if (CheckCollision()) {
if (a8::HasBitFlag(status, CS_Collisioning)) { if (a8::HasBitFlag(status, CS_Collisioning)) {
SetPos(old_pos); SetPos(old_pos);
@ -2097,12 +2100,14 @@ void Human::_InternalUpdateMove(float speed)
#endif #endif
nx = 0; nx = 0;
} }
#endif
// 999 // 999
#if 1 #if 1
#else #else
SetPos(old_pos + a8::Vec2(nx, ny)); SetPos(old_pos + a8::Vec2(nx, ny));
#endif #endif
#if 0
if (CheckCollision()) { if (CheckCollision()) {
if (a8::HasBitFlag(status, CS_Collisioning)) { if (a8::HasBitFlag(status, CS_Collisioning)) {
SetPos(old_pos); SetPos(old_pos);
@ -2116,6 +2121,7 @@ void Human::_InternalUpdateMove(float speed)
#endif #endif
ny = 0; ny = 0;
} }
#endif
// 999 // 999
#if 1 #if 1
#else #else