diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index c1884f0a..88fdb9a8 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -94,19 +94,11 @@ void Android::GiveEquip() } } -void Android::SetAiLevel(int ai_level) -{ -} - void Android::RandSkin() { if (!robot_meta->skin_id.empty()) { Skin& skin = skins[0]; - #if 1 skin.skin_id = 1 + (robot_meta->i->id() % 3); - #else - skin.skin_id = robot_meta->skin_id[rand() % robot_meta->skin_id.size()]; - #endif skin.skin_lv = 1; } } diff --git a/server/gameserver/android.h b/server/gameserver/android.h index 1e5ba8f3..4c58a6c6 100644 --- a/server/gameserver/android.h +++ b/server/gameserver/android.h @@ -7,7 +7,6 @@ namespace MetaData class Robot; } -class AIComponent; class Android : public Human { public: @@ -17,7 +16,6 @@ class Android : public Human virtual void Initialize() override; virtual void Update(int delta_time) override; void GiveEquip(); - void SetAiLevel(int ai_level); protected: Android(); diff --git a/server/gameserver/moveableentity.h b/server/gameserver/moveableentity.h index 4005c9d6..2c476ace 100644 --- a/server/gameserver/moveableentity.h +++ b/server/gameserver/moveableentity.h @@ -4,7 +4,6 @@ #include "roomentity.h" #include "movehelper.h" -class AIComponent; class MoveableEntity : public RoomEntity { public: diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 059aa872..b05f9932 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -3762,7 +3762,9 @@ void Room::InitAndroidAI() int ai_level = std::get<0>(tuple); int space = std::get<1>(tuple); if (rnd <= space) { +#if 0 hum->SetAiLevel(ai_level); +#endif ++ai_num[ai_level]; found = true; break; @@ -3770,7 +3772,9 @@ void Room::InitAndroidAI() } if (!found) { int ai_level = 1; +#if 0 hum->SetAiLevel(ai_level); +#endif ++ai_num[ai_level]; } #ifdef DEBGU