diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc index a1d94ba..2a14093 100644 --- a/server/gameserver/metadata.cc +++ b/server/gameserver/metadata.cc @@ -478,13 +478,14 @@ namespace MetaData void MapTplThing::Init() { + param1_int = a8::XValue(i->param1()); metatable::MapTplThingJson* mutable_i = (metatable::MapTplThingJson*)i; if (mutable_i->object_type() == "spawn_point") { mutable_i->set__object_type(kMOT_SpawnPoint); - } else if (mutable_i->object_type() == "mon_spawn_point") { + } else if (mutable_i->object_type() == "monster_spawn_point") { mutable_i->set__object_type(kMOT_MonsterSpawnPoint); std::vector strings; - a8::Split(i->things(), strings, '\n'); + a8::Split(i->param1(), strings, '|'); for (auto& str : strings) { heros.push_back(a8::XValue(str)); } diff --git a/server/gameserver/metadata.h b/server/gameserver/metadata.h index 071e24f..62bf206 100755 --- a/server/gameserver/metadata.h +++ b/server/gameserver/metadata.h @@ -145,6 +145,7 @@ namespace MetaData std::vector> things; std::vector heros; + int param1_int = 0; int rand_space = 0; }; diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 2e3f01b..54953aa 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2007,7 +2007,7 @@ BornPoint* Room::AllocBornPoint(Human* hum) for (auto& pair : born_point_hash_) { if (&pair.second != hum->born_point) { if (pair.second.player_num + pair.second.android_num < - pair.second.thing_tpl->i->param1()) { + pair.second.thing_tpl->param1_int) { point_list.push_back(&pair.second); free_point_list.push_back(&pair.second);; } @@ -2036,7 +2036,7 @@ BornPoint* Room::AllocBornPoint(Human* hum) } else { for (auto& pair : born_point_hash_) { if (pair.second.player_num + pair.second.android_num < - pair.second.thing_tpl->i->param1()) { + pair.second.thing_tpl->param1_int) { born_point = &pair.second; break; } diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index 0c9faad..0e4f79b 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -373,7 +373,7 @@ message MapTplThingJson optional float y = 6; optional float height = 7; optional float width = 8; - optional float param1 = 9; + optional string param1 = 9; optional float param2 = 10; optional float param3 = 11; optional string object_type = 12;