From dfa635308a08300d68dcfb07cdaab50ade3a39a8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 18 Jul 2019 20:31:38 +0800 Subject: [PATCH] 1 --- server/gameserver/CMakeLists.txt | 1 - server/gameserver/android.ai.cc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt index 5f55169..435621b 100644 --- a/server/gameserver/CMakeLists.txt +++ b/server/gameserver/CMakeLists.txt @@ -78,5 +78,4 @@ target_link_libraries( curl hiredis tinyxml2 - tcmalloc ) diff --git a/server/gameserver/android.ai.cc b/server/gameserver/android.ai.cc index ad03584..428c33d 100644 --- a/server/gameserver/android.ai.cc +++ b/server/gameserver/android.ai.cc @@ -102,7 +102,7 @@ void AndroidAI::DoMove() for (int i = 0; i < speed; ++i) { a8::Vec2 old_pos = hum->pos; hum->pos = hum->pos + hum->move_dir; - if (hum->IsCollision()) { + if (hum->IsCollisionInMapService()) { hum->pos = old_pos; if (i == 0) { hum->FindPath();