diff --git a/server/gameserver/mapinstance.cc b/server/gameserver/mapinstance.cc index 1623372..6928bf5 100644 --- a/server/gameserver/mapinstance.cc +++ b/server/gameserver/mapinstance.cc @@ -72,8 +72,7 @@ void MapInstance::AttachRoom(Room* room, RoomInitInfo& init_info) init_info.map_service = map_service_; init_info.mini_room_spawn_points = &mini_room_spawn_points_; init_info.normal_room_spawn_points = &normal_room_spawn_points_; - init_info.mini_room_monster_spawn_points = &mini_room_monster_spawn_points_; - init_info.normal_room_monster_spawn_points = &normal_room_monster_spawn_points_; + init_info.room_monster_spawn_points = &room_monster_spawn_points_; init_info.level0room_born_point_meta = level0room_born_point_; init_info.level1room_born_point_meta = level1room_born_point_; init_info.loots = &loots_; @@ -128,8 +127,7 @@ void MapInstance::CreateThings() break; case kMOT_MonsterSpawnPoint: { - normal_room_monster_spawn_points_.push_back(&thing_tpl); - mini_room_monster_spawn_points_.push_back(&thing_tpl); + room_monster_spawn_points_.push_back(&thing_tpl); } break; default: diff --git a/server/gameserver/mapinstance.h b/server/gameserver/mapinstance.h index 24b2c92..2891ff3 100644 --- a/server/gameserver/mapinstance.h +++ b/server/gameserver/mapinstance.h @@ -47,8 +47,7 @@ class MapInstance GridService* grid_service_ = nullptr; std::vector mini_room_spawn_points_; std::vector normal_room_spawn_points_; - std::vector mini_room_monster_spawn_points_; - std::vector normal_room_monster_spawn_points_; + std::vector room_monster_spawn_points_; MetaData::MapTplThing* level0room_born_point_ = nullptr; MetaData::MapTplThing* level1room_born_point_ = nullptr; std::vector loots_; diff --git a/server/gameserver/room.h b/server/gameserver/room.h index 84a53a9..3bd773c 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -272,7 +272,7 @@ private: const std::vector* mini_room_spawn_points_ = nullptr; const std::vector* normal_room_spawn_points_ = nullptr; const std::vector* mini_room_monster_spawn_points_ = nullptr; - const std::vector* normal_room_monster_spawn_points_ = nullptr; + const std::vector* room_monster_spawn_points_ = nullptr; const MetaData::MapTplThing* level0room_born_point_meta_ = nullptr; const MetaData::MapTplThing* level1room_born_point_meta_ = nullptr; const std::vector* loots_ = nullptr; diff --git a/server/gameserver/types.h b/server/gameserver/types.h index 12c81f9..6d90db2 100755 --- a/server/gameserver/types.h +++ b/server/gameserver/types.h @@ -183,8 +183,7 @@ struct RoomInitInfo MapService* map_service = nullptr; const std::vector* mini_room_spawn_points = nullptr; const std::vector* normal_room_spawn_points = nullptr; - const std::vector* mini_room_monster_spawn_points = nullptr; - const std::vector* normal_room_monster_spawn_points = nullptr; + const std::vector* room_monster_spawn_points = nullptr; const MetaData::MapTplThing* level0room_born_point_meta = nullptr; const MetaData::MapTplThing* level1room_born_point_meta = nullptr; const std::vector* loots = nullptr;