diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index c8d34b82..1e4e3963 100644 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -524,6 +524,7 @@ enum BtEvent_e { kUnderAttackEvent = 0, kMasterUnderAttackEvent = 1, + kMobaModeReviveEvent = 2, }; const char* const PROJ_NAME_FMT = "game%d_gameserver"; diff --git a/server/gameserver/creature.h b/server/gameserver/creature.h index c72ca59a..7fdbb8c4 100644 --- a/server/gameserver/creature.h +++ b/server/gameserver/creature.h @@ -132,6 +132,8 @@ class Creature : public MoveableEntity a8::XTimerWp nature_recover_hp_idle_timer; int side = 0; + int road_idx = 0; + int point_idx = 0; Creature(); virtual ~Creature() override; diff --git a/server/gameserver/mt/Map.cc b/server/gameserver/mt/Map.cc index 78eab8e1..48d9f36a 100644 --- a/server/gameserver/mt/Map.cc +++ b/server/gameserver/mt/Map.cc @@ -361,7 +361,7 @@ namespace mt const std::tuple, int>& b) { return std::get<0>(a)->pos.x < std::get<0>(b)->pos.x; }); - if (!points.empty()) { + if (points.size() < 3) { abort(); } }