diff --git a/server/gameserver/mtb/Map.h b/server/gameserver/mtb/Map.h index aee033fd..40a8b5ea 100644 --- a/server/gameserver/mtb/Map.h +++ b/server/gameserver/mtb/Map.h @@ -31,6 +31,9 @@ namespace mtb const std::string map_collider() const { return map_collider_; }; const std::string world_object_file() const { return world_object_file_; }; const std::string terrain_file() const { return terrain_file_; }; + int map_type() const { return map_type_; }; + int team() const { return team_; }; + int star_condition() const { return star_condition_; }; bool has_map_id() const { return __flags__.test(0);}; bool has_template_list() const { return __flags__.test(1);}; @@ -53,6 +56,9 @@ namespace mtb bool has_map_collider() const { return __flags__.test(18);}; bool has_world_object_file() const { return __flags__.test(19);}; bool has_terrain_file() const { return __flags__.test(20);}; + bool has_map_type() const { return __flags__.test(21);}; + bool has_team() const { return __flags__.test(22);}; + bool has_star_condition() const { return __flags__.test(23);}; protected: @@ -77,6 +83,9 @@ namespace mtb std::string map_collider_; std::string world_object_file_; std::string terrain_file_; + int map_type_ = 0; + int team_ = 0; + int star_condition_ = 0; public: std::bitset<21> __flags__; diff --git a/server/gameserver/mtb/mtb.all.cc b/server/gameserver/mtb/mtb.all.cc index 09c3ff8f..89889e37 100644 --- a/server/gameserver/mtb/mtb.all.cc +++ b/server/gameserver/mtb/mtb.all.cc @@ -71,7 +71,7 @@ namespace mtb { a8::reflect::Class* meta_class = nullptr; if (!meta_class) { - meta_class = new a8::reflect::Class("Map", 21, 0); + meta_class = new a8::reflect::Class("Map", 24, 0); meta_class->SetSimpleField(0, "map_id", a8::reflect::ET_INT32, my_offsetof2(Map, map_id_)); meta_class->SetSimpleField(1, "template_list", a8::reflect::ET_STRING, my_offsetof2(Map, template_list_)); meta_class->SetSimpleField(2, "map_name", a8::reflect::ET_STRING, my_offsetof2(Map, map_name_)); @@ -93,6 +93,9 @@ namespace mtb meta_class->SetSimpleField(18, "map_collider", a8::reflect::ET_STRING, my_offsetof2(Map, map_collider_)); meta_class->SetSimpleField(19, "world_object_file", a8::reflect::ET_STRING, my_offsetof2(Map, world_object_file_)); meta_class->SetSimpleField(20, "terrain_file", a8::reflect::ET_STRING, my_offsetof2(Map, terrain_file_)); + meta_class->SetSimpleField(21, "map_type", a8::reflect::ET_INT32, my_offsetof2(Map, map_type_)); + meta_class->SetSimpleField(22, "team", a8::reflect::ET_INT32, my_offsetof2(Map, team_)); + meta_class->SetSimpleField(23, "star_condition", a8::reflect::ET_INT32, my_offsetof2(Map, star_condition_)); } return meta_class; }