diff --git a/server/gameserver/mtb/MapMode.h b/server/gameserver/mtb/MapMode.h index a75c8ebd..29dd7a74 100644 --- a/server/gameserver/mtb/MapMode.h +++ b/server/gameserver/mtb/MapMode.h @@ -12,7 +12,7 @@ namespace mtb std::shared_ptr GetClass() const; int id() const { return id_; }; int mode() const { return mode_; }; - int map_mode() const { return map_mode_; }; + int mapMode() const { return mapMode_; }; int is_open() const { return is_open_; }; const std::string map_list() const { return map_list_; }; int level_require() const { return level_require_; }; @@ -20,7 +20,7 @@ namespace mtb bool has_id() const { return __flags__.test(0);}; bool has_mode() const { return __flags__.test(1);}; - bool has_map_mode() const { return __flags__.test(2);}; + bool has_mapMode() const { return __flags__.test(2);}; bool has_is_open() const { return __flags__.test(3);}; bool has_map_list() const { return __flags__.test(4);}; bool has_level_require() const { return __flags__.test(5);}; @@ -30,7 +30,7 @@ namespace mtb int id_ = 0; int mode_ = 0; - int map_mode_ = 0; + int mapMode_ = 0; int is_open_ = 0; std::string map_list_; int level_require_ = 0; diff --git a/server/gameserver/mtb/mtb.all.cc b/server/gameserver/mtb/mtb.all.cc index 0f3f7606..e3194fee 100644 --- a/server/gameserver/mtb/mtb.all.cc +++ b/server/gameserver/mtb/mtb.all.cc @@ -121,7 +121,7 @@ namespace mtb meta_class = std::make_shared("MapMode", 7, 0); meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(MapMode, id_)); meta_class->SetSimpleField(1, "mode", a8::reflect::ET_INT32, my_offsetof2(MapMode, mode_)); - meta_class->SetSimpleField(2, "map_mode", a8::reflect::ET_INT32, my_offsetof2(MapMode, map_mode_)); + meta_class->SetSimpleField(2, "mapMode", a8::reflect::ET_INT32, my_offsetof2(MapMode, mapMode_)); meta_class->SetSimpleField(3, "is_open", a8::reflect::ET_INT32, my_offsetof2(MapMode, is_open_)); meta_class->SetSimpleField(4, "map_list", a8::reflect::ET_STRING, my_offsetof2(MapMode, map_list_)); meta_class->SetSimpleField(5, "level_require", a8::reflect::ET_INT32, my_offsetof2(MapMode, level_require_)); diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index ee47b98b..f01d7a04 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -3988,7 +3988,7 @@ void Room::MobaBatterysUpdate() int Room::GetReportMapMode() { - return GetMapModeMeta()->map_mode(); + return GetMapModeMeta()->mapMode(); } void Room::GenBattleRoomReportData(a8::MutableXObject* params) diff --git a/server/tools/protobuild/mt.proto b/server/tools/protobuild/mt.proto index 1d8bf9b0..ac088461 100755 --- a/server/tools/protobuild/mt.proto +++ b/server/tools/protobuild/mt.proto @@ -51,7 +51,7 @@ message MapMode { optional int32 id = 1; optional int32 mode = 2; - optional int32 map_mode = 3; + optional int32 mapMode = 3; optional int32 is_open = 4; optional string map_list = 5; optional int32 level_require = 6;