diff --git a/dCommon/dEnums/MessageType/Game.h b/dCommon/dEnums/MessageType/Game.h index 3b6c2c895..28f3a398b 100644 --- a/dCommon/dEnums/MessageType/Game.h +++ b/dCommon/dEnums/MessageType/Game.h @@ -733,8 +733,8 @@ namespace MessageType { USE_UNIQUE_ITEM = 789, GET_IS_PET = 790, DELETE_PROPERTY = 791, - CREATEMODEL_FROM_CLIENT = 792, - UPDATE_MODEL_FROM_CLIENT = 793, + DELETE_PROPERTY_RESPONSE = 792, + CREATE_MODEL_FROM_CLIENT = 793, DELETE_MODEL_FROM_CLIENT = 794, SHOW_PROPERTY_BOUNDS = 795, SET_PROPERTY_I_DS = 796, @@ -845,8 +845,8 @@ namespace MessageType { PROPERTY_BUILD_MODE_CHANGED = 912, PROPERTY_BUILD_MODE_UPDATE = 913, PROPERTY_DELETION_ACTION = 914, - PROPERTY_MODERATION_STATUS_ACTION = 915, - PROPERTY_MODERATION_STATUS_ACTION_RESPONSE = 916, + PROPERTY_MODERATION_ACTION = 915, + PROPERTY_MODERATION_ACTION_RESPONSE = 916, PROPERTY_MODERATION_STATUS_UPDATE = 917, PROPERTY_NEEDS_GM_ATTENTION = 918, PROPERTY_MODERATION_CHANGED = 919, diff --git a/dGame/dGameMessages/GameMessageHandler.cpp b/dGame/dGameMessages/GameMessageHandler.cpp index 4799cc401..60a9a079b 100644 --- a/dGame/dGameMessages/GameMessageHandler.cpp +++ b/dGame/dGameMessages/GameMessageHandler.cpp @@ -122,7 +122,7 @@ namespace { { ZONE_PROPERTY_MODEL_EQUIPPED, []() { return std::make_unique(); } }, { ZONE_PROPERTY_MODEL_ROTATED, []() { return std::make_unique(); } }, { PLACE_PROPERTY_MODEL, []() { return std::make_unique(); } }, - { UPDATE_MODEL_FROM_CLIENT, []() { return std::make_unique(); } }, + { CREATE_MODEL_FROM_CLIENT, []() { return std::make_unique(); } }, { DELETE_MODEL_FROM_CLIENT, []() { return std::make_unique(); } }, { CONTROL_BEHAVIORS, []() { return std::make_unique(); } }, { PROPERTY_ENTRANCE_SYNC, []() { return std::make_unique(); } }, diff --git a/dGame/dGameMessages/PropertyMessages.h b/dGame/dGameMessages/PropertyMessages.h index b1ee51f39..6775cd143 100644 --- a/dGame/dGameMessages/PropertyMessages.h +++ b/dGame/dGameMessages/PropertyMessages.h @@ -268,9 +268,9 @@ namespace GameMessages { LWOOBJID modelID{}; }; - // Client -> server. + // Client -> server. The client names message 793 CreateModelFromClient. struct UpdateModelFromClient : public NetGameMsg { - UpdateModelFromClient() : NetGameMsg(MessageType::Game::UPDATE_MODEL_FROM_CLIENT) {} + UpdateModelFromClient() : NetGameMsg(MessageType::Game::CREATE_MODEL_FROM_CLIENT) {} void Serialize(RakNet::BitStream& bitStream) const override; bool Deserialize(RakNet::BitStream& bitStream) override; void Handle(Entity& entity, const SystemAddress& sysAddr) override; diff --git a/tests/dCommonTests/MessageIdPinTests.cpp b/tests/dCommonTests/MessageIdPinTests.cpp index 99338220f..3b6cfdf61 100644 --- a/tests/dCommonTests/MessageIdPinTests.cpp +++ b/tests/dCommonTests/MessageIdPinTests.cpp @@ -891,8 +891,8 @@ static_assert(static_cast(MessageType::Game::GET_MISSION_OFFERER_LOT) = static_assert(static_cast(MessageType::Game::USE_UNIQUE_ITEM) == 789); static_assert(static_cast(MessageType::Game::GET_IS_PET) == 790); static_assert(static_cast(MessageType::Game::DELETE_PROPERTY) == 791); -static_assert(static_cast(MessageType::Game::CREATEMODEL_FROM_CLIENT) == 792); -static_assert(static_cast(MessageType::Game::UPDATE_MODEL_FROM_CLIENT) == 793); +static_assert(static_cast(MessageType::Game::DELETE_PROPERTY_RESPONSE) == 792); +static_assert(static_cast(MessageType::Game::CREATE_MODEL_FROM_CLIENT) == 793); static_assert(static_cast(MessageType::Game::DELETE_MODEL_FROM_CLIENT) == 794); static_assert(static_cast(MessageType::Game::SHOW_PROPERTY_BOUNDS) == 795); static_assert(static_cast(MessageType::Game::SET_PROPERTY_I_DS) == 796); @@ -1003,8 +1003,8 @@ static_assert(static_cast(MessageType::Game::NOTIFY_CLIENT_UGC_ICON_REA static_assert(static_cast(MessageType::Game::PROPERTY_BUILD_MODE_CHANGED) == 912); static_assert(static_cast(MessageType::Game::PROPERTY_BUILD_MODE_UPDATE) == 913); static_assert(static_cast(MessageType::Game::PROPERTY_DELETION_ACTION) == 914); -static_assert(static_cast(MessageType::Game::PROPERTY_MODERATION_STATUS_ACTION) == 915); -static_assert(static_cast(MessageType::Game::PROPERTY_MODERATION_STATUS_ACTION_RESPONSE) == 916); +static_assert(static_cast(MessageType::Game::PROPERTY_MODERATION_ACTION) == 915); +static_assert(static_cast(MessageType::Game::PROPERTY_MODERATION_ACTION_RESPONSE) == 916); static_assert(static_cast(MessageType::Game::PROPERTY_MODERATION_STATUS_UPDATE) == 917); static_assert(static_cast(MessageType::Game::PROPERTY_NEEDS_GM_ATTENTION) == 918); static_assert(static_cast(MessageType::Game::PROPERTY_MODERATION_CHANGED) == 919); diff --git a/tests/dGameTests/dGameMessagesTests/LegacyGameMessageTests.cpp b/tests/dGameTests/dGameMessagesTests/LegacyGameMessageTests.cpp index a1f4bf856..d733b46d2 100644 --- a/tests/dGameTests/dGameMessagesTests/LegacyGameMessageTests.cpp +++ b/tests/dGameTests/dGameMessagesTests/LegacyGameMessageTests.cpp @@ -139,7 +139,7 @@ TEST(LegacyGameMessageTests, AssertLegacyGmValues) { EXPECT_EQ(MessageType::Game::SET_GHOST_REFERENCE_POSITION, static_cast(768)); EXPECT_EQ(MessageType::Game::FIRE_EVENT_SERVER_SIDE, static_cast(770)); EXPECT_EQ(MessageType::Game::SCRIPT_NETWORK_VAR_UPDATE, static_cast(781)); - EXPECT_EQ(MessageType::Game::UPDATE_MODEL_FROM_CLIENT, static_cast(793)); + EXPECT_EQ(MessageType::Game::CREATE_MODEL_FROM_CLIENT, static_cast(793)); EXPECT_EQ(MessageType::Game::DELETE_MODEL_FROM_CLIENT, static_cast(794)); EXPECT_EQ(MessageType::Game::PLAY_ND_AUDIO_EMITTER, static_cast(821)); EXPECT_EQ(MessageType::Game::PLAY2_D_AMBIENT_SOUND, static_cast(831));