From cab9bee9976db3189113c9779a9a006ed93befc2 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 5 Sep 2024 13:36:44 +0800 Subject: [PATCH] 1 --- README.md | 2 ++ server/gameserver/CMakeLists.txt | 6 +++--- server/gameserver/player.cc | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b0e7634c..6395beec 100644 --- a/README.md +++ b/README.md @@ -15,3 +15,5 @@ SMUiUpdate https://www.cnblogs.com/fellow1988/p/17263427.html export ASAN_OPTIONS=halt_on_error=false:print_scariness=true:fast_unwind_on_malloc=true:detect_leak=1 + +# diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt index 7d45a86a..3c018ae9 100644 --- a/server/gameserver/CMakeLists.txt +++ b/server/gameserver/CMakeLists.txt @@ -14,11 +14,11 @@ endif() set(LIB_DIR "ubuntu20.04_g++-9") message(LIB_DIR: ${LIB_DIR} ) -set(CMAKE_CXX_FLAGS_RELEASE "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -DNEW_NUM=1 -DA8_PERFT=1") +set(CMAKE_CXX_FLAGS_RELEASE "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -DNEW_NUM=1 -DA8_PERFT=1 -DCLIENT_PREDICTION_POS=1") if (${ASAN}) - set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DMYDEBUG -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -fsanitize=address -DNEW_NUM=1 -fno-omit-frame-pointer -DA8_PERFT=1 -fsanitize-recover=address") + set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DMYDEBUG -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -fsanitize=address -DNEW_NUM=1 -fno-omit-frame-pointer -DA8_PERFT=1 -fsanitize-recover=address -DCLIENT_PREDICTION_POS=1") else() - set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DMYDEBUG -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -DNEW_NUM=1 -DA8_PERFT=1 -fsanitize-recover=address") + set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DMYDEBUG -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1 -DNEW_NUM=1 -DA8_PERFT=1 -fsanitize-recover=address -DCLIENT_PREDICTION_POS=1") endif() include_directories( diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index dc2998f8..6c389a11 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -229,9 +229,15 @@ void Player::InternalUpdate(int delta_time) moving = false; } } +#if 1 + if (GetMovement()->GetPathSize() > 0) { + moving = true; + } +#else if (GetMovement()->IsFindPath()) { moving = true; } +#endif #if 1 if (moving) { UpdateMoving();