diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index ee84a8e69..7a25adf6e 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -833,13 +833,13 @@ int CClient::SendMsgExY(CMsgPacker *pMsg, int Flags, bool System, int NetClient) void CClient::DummyInfo() { CNetMsg_Cl_ChangeInfo Msg; - Msg.m_pName = g_Config.m_DummyName; - Msg.m_pClan = g_Config.m_DummyClan; - Msg.m_Country = g_Config.m_DummyCountry; - Msg.m_pSkin = g_Config.m_DummySkin; - Msg.m_UseCustomColor = g_Config.m_DummyUseCustomColor; - Msg.m_ColorBody = g_Config.m_DummyColorBody; - Msg.m_ColorFeet = g_Config.m_DummyColorFeet; + Msg.m_pName = g_Config.m_ClDummyName; + Msg.m_pClan = g_Config.m_ClDummyClan; + Msg.m_Country = g_Config.m_ClDummyCountry; + Msg.m_pSkin = g_Config.m_ClDummySkin; + Msg.m_UseCustomColor = g_Config.m_ClDummyUseCustomColor; + Msg.m_ColorBody = g_Config.m_ClDummyColorBody; + Msg.m_ColorFeet = g_Config.m_ClDummyColorFeet; CMsgPacker Packer(Msg.MsgID()); Msg.Pack(&Packer); SendMsgExY(&Packer, MSGFLAG_VITAL); diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index a6aeef6a2..5f146f543 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -242,9 +242,9 @@ void CMenus::RenderSettingsPlayer(CUIRect MainView) if(s_Dummy) { - Name = g_Config.m_DummyName; - Clan = g_Config.m_DummyClan; - Country = &g_Config.m_DummyCountry; + Name = g_Config.m_ClDummyName; + Clan = g_Config.m_ClDummyClan; + Country = &g_Config.m_ClDummyCountry; } // player name @@ -331,17 +331,17 @@ void CMenus::RenderSettingsTee(CUIRect MainView) MainView.HSplitTop(10.0f, 0, &MainView); static bool s_Dummy = false; - char *Skin = g_Config.m_PlayerSkin; - int *UseCustomColor = &g_Config.m_PlayerUseCustomColor; - int *ColorBody = &g_Config.m_PlayerColorBody; - int *ColorFeet = &g_Config.m_PlayerColorFeet; + char *Skin = g_Config.m_ClPlayerSkin; + int *UseCustomColor = &g_Config.m_ClPlayerUseCustomColor; + int *ColorBody = &g_Config.m_ClPlayerColorBody; + int *ColorFeet = &g_Config.m_ClPlayerColorFeet; if(s_Dummy) { - Skin = g_Config.m_DummySkin; - UseCustomColor = &g_Config.m_DummyUseCustomColor; - ColorBody = &g_Config.m_DummyColorBody; - ColorFeet = &g_Config.m_DummyColorFeet; + Skin = g_Config.m_ClDummySkin; + UseCustomColor = &g_Config.m_ClDummyUseCustomColor; + ColorBody = &g_Config.m_ClDummyColorBody; + ColorFeet = &g_Config.m_ClDummyColorFeet; } // skin info @@ -534,7 +534,7 @@ void CMenus::RenderSettingsTee(CUIRect MainView) const int NewSelected = UiDoListboxEnd(&s_ScrollValue, 0); if(OldSelected != NewSelected) { - mem_copy(Skin, s_paSkinList[NewSelected]->m_aName, sizeof(g_Config.m_PlayerSkin)); + mem_copy(Skin, s_paSkinList[NewSelected]->m_aName, sizeof(g_Config.m_ClPlayerSkin)); if(s_Dummy) m_NeedSendDummyinfo = true; else diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp index 059cb3d9a..d50fe5bb8 100644 --- a/src/game/client/gameclient.cpp +++ b/src/game/client/gameclient.cpp @@ -593,10 +593,10 @@ void CGameClient::OnRender() str_comp(m_aClients[Client()->m_LocalIDs[0]].m_aName, g_Config.m_PlayerName) || str_comp(m_aClients[Client()->m_LocalIDs[0]].m_aClan, g_Config.m_PlayerClan) || m_aClients[Client()->m_LocalIDs[0]].m_Country != g_Config.m_PlayerCountry || - str_comp(m_aClients[Client()->m_LocalIDs[0]].m_aSkinName, g_Config.m_PlayerSkin) || - m_aClients[Client()->m_LocalIDs[0]].m_UseCustomColor != g_Config.m_PlayerUseCustomColor || - m_aClients[Client()->m_LocalIDs[0]].m_ColorBody != g_Config.m_PlayerColorBody || - m_aClients[Client()->m_LocalIDs[0]].m_ColorFeet != g_Config.m_PlayerColorFeet + str_comp(m_aClients[Client()->m_LocalIDs[0]].m_aSkinName, g_Config.m_ClPlayerSkin) || + m_aClients[Client()->m_LocalIDs[0]].m_UseCustomColor != g_Config.m_ClPlayerUseCustomColor || + m_aClients[Client()->m_LocalIDs[0]].m_ColorBody != g_Config.m_ClPlayerColorBody || + m_aClients[Client()->m_LocalIDs[0]].m_ColorFeet != g_Config.m_ClPlayerColorFeet ) SendInfo(false); else @@ -609,13 +609,13 @@ void CGameClient::OnRender() if(Client()->DummyConnected()) { if(m_CheckInfo[1] == 0) { if( - str_comp(m_aClients[Client()->m_LocalIDs[1]].m_aName, g_Config.m_DummyName) || - str_comp(m_aClients[Client()->m_LocalIDs[1]].m_aClan, g_Config.m_DummyClan) || - m_aClients[Client()->m_LocalIDs[1]].m_Country != g_Config.m_DummyCountry || - str_comp(m_aClients[Client()->m_LocalIDs[1]].m_aSkinName, g_Config.m_DummySkin) || - m_aClients[Client()->m_LocalIDs[1]].m_UseCustomColor != g_Config.m_DummyUseCustomColor || - m_aClients[Client()->m_LocalIDs[1]].m_ColorBody != g_Config.m_DummyColorBody || - m_aClients[Client()->m_LocalIDs[1]].m_ColorFeet != g_Config.m_DummyColorFeet + str_comp(m_aClients[Client()->m_LocalIDs[1]].m_aName, g_Config.m_ClDummyName) || + str_comp(m_aClients[Client()->m_LocalIDs[1]].m_aClan, g_Config.m_ClDummyClan) || + m_aClients[Client()->m_LocalIDs[1]].m_Country != g_Config.m_ClDummyCountry || + str_comp(m_aClients[Client()->m_LocalIDs[1]].m_aSkinName, g_Config.m_ClDummySkin) || + m_aClients[Client()->m_LocalIDs[1]].m_UseCustomColor != g_Config.m_ClDummyUseCustomColor || + m_aClients[Client()->m_LocalIDs[1]].m_ColorBody != g_Config.m_ClDummyColorBody || + m_aClients[Client()->m_LocalIDs[1]].m_ColorFeet != g_Config.m_ClDummyColorFeet ) SendDummyInfo(false); else @@ -1832,10 +1832,10 @@ void CGameClient::SendInfo(bool Start) Msg.m_pName = g_Config.m_PlayerName; Msg.m_pClan = g_Config.m_PlayerClan; Msg.m_Country = g_Config.m_PlayerCountry; - Msg.m_pSkin = g_Config.m_PlayerSkin; - Msg.m_UseCustomColor = g_Config.m_PlayerUseCustomColor; - Msg.m_ColorBody = g_Config.m_PlayerColorBody; - Msg.m_ColorFeet = g_Config.m_PlayerColorFeet; + Msg.m_pSkin = g_Config.m_ClPlayerSkin; + Msg.m_UseCustomColor = g_Config.m_ClPlayerUseCustomColor; + Msg.m_ColorBody = g_Config.m_ClPlayerColorBody; + Msg.m_ColorFeet = g_Config.m_ClPlayerColorFeet; CMsgPacker Packer(Msg.MsgID()); Msg.Pack(&Packer); Client()->SendMsgExY(&Packer, MSGFLAG_VITAL, false, 0); @@ -1847,10 +1847,10 @@ void CGameClient::SendInfo(bool Start) Msg.m_pName = g_Config.m_PlayerName; Msg.m_pClan = g_Config.m_PlayerClan; Msg.m_Country = g_Config.m_PlayerCountry; - Msg.m_pSkin = g_Config.m_PlayerSkin; - Msg.m_UseCustomColor = g_Config.m_PlayerUseCustomColor; - Msg.m_ColorBody = g_Config.m_PlayerColorBody; - Msg.m_ColorFeet = g_Config.m_PlayerColorFeet; + Msg.m_pSkin = g_Config.m_ClPlayerSkin; + Msg.m_UseCustomColor = g_Config.m_ClPlayerUseCustomColor; + Msg.m_ColorBody = g_Config.m_ClPlayerColorBody; + Msg.m_ColorFeet = g_Config.m_ClPlayerColorFeet; CMsgPacker Packer(Msg.MsgID()); Msg.Pack(&Packer); Client()->SendMsgExY(&Packer, MSGFLAG_VITAL, false, 0); @@ -1863,13 +1863,13 @@ void CGameClient::SendDummyInfo(bool Start) if(Start) { CNetMsg_Cl_StartInfo Msg; - Msg.m_pName = g_Config.m_DummyName; - Msg.m_pClan = g_Config.m_DummyClan; - Msg.m_Country = g_Config.m_DummyCountry; - Msg.m_pSkin = g_Config.m_DummySkin; - Msg.m_UseCustomColor = g_Config.m_DummyUseCustomColor; - Msg.m_ColorBody = g_Config.m_DummyColorBody; - Msg.m_ColorFeet = g_Config.m_DummyColorFeet; + Msg.m_pName = g_Config.m_ClDummyName; + Msg.m_pClan = g_Config.m_ClDummyClan; + Msg.m_Country = g_Config.m_ClDummyCountry; + Msg.m_pSkin = g_Config.m_ClDummySkin; + Msg.m_UseCustomColor = g_Config.m_ClDummyUseCustomColor; + Msg.m_ColorBody = g_Config.m_ClDummyColorBody; + Msg.m_ColorFeet = g_Config.m_ClDummyColorFeet; CMsgPacker Packer(Msg.MsgID()); Msg.Pack(&Packer); Client()->SendMsgExY(&Packer, MSGFLAG_VITAL, false, 1); @@ -1878,13 +1878,13 @@ void CGameClient::SendDummyInfo(bool Start) else { CNetMsg_Cl_ChangeInfo Msg; - Msg.m_pName = g_Config.m_DummyName; - Msg.m_pClan = g_Config.m_DummyClan; - Msg.m_Country = g_Config.m_DummyCountry; - Msg.m_pSkin = g_Config.m_DummySkin; - Msg.m_UseCustomColor = g_Config.m_DummyUseCustomColor; - Msg.m_ColorBody = g_Config.m_DummyColorBody; - Msg.m_ColorFeet = g_Config.m_DummyColorFeet; + Msg.m_pName = g_Config.m_ClDummyName; + Msg.m_pClan = g_Config.m_ClDummyClan; + Msg.m_Country = g_Config.m_ClDummyCountry; + Msg.m_pSkin = g_Config.m_ClDummySkin; + Msg.m_UseCustomColor = g_Config.m_ClDummyUseCustomColor; + Msg.m_ColorBody = g_Config.m_ClDummyColorBody; + Msg.m_ColorFeet = g_Config.m_ClDummyColorFeet; CMsgPacker Packer(Msg.MsgID()); Msg.Pack(&Packer); Client()->SendMsgExY(&Packer, MSGFLAG_VITAL,false, 1); diff --git a/src/game/variables.h b/src/game/variables.h index ed0113d90..47e4a85e5 100644 --- a/src/game/variables.h +++ b/src/game/variables.h @@ -79,10 +79,10 @@ MACRO_CONFIG_INT(ClAutoStatboardScreenshotMax, cl_auto_statboard_screenshot_max, MACRO_CONFIG_INT(ClDefaultZoom, cl_default_zoom, 10, 0, 20, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Default zoom level (10 default, min 0, max 20)") -MACRO_CONFIG_INT(PlayerUseCustomColor, player_use_custom_color, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Toggles usage of custom colors") -MACRO_CONFIG_INT(PlayerColorBody, player_color_body, 65408, 0, 0xFFFFFF, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Player body color") -MACRO_CONFIG_INT(PlayerColorFeet, player_color_feet, 65408, 0, 0xFFFFFF, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Player feet color") -MACRO_CONFIG_STR(PlayerSkin, player_skin, 24, "default", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Player skin") +MACRO_CONFIG_INT(ClPlayerUseCustomColor, player_use_custom_color, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Toggles usage of custom colors") +MACRO_CONFIG_INT(ClPlayerColorBody, player_color_body, 65408, 0, 0xFFFFFF, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Player body color") +MACRO_CONFIG_INT(ClPlayerColorFeet, player_color_feet, 65408, 0, 0xFFFFFF, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Player feet color") +MACRO_CONFIG_STR(ClPlayerSkin, player_skin, 24, "default", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Player skin") MACRO_CONFIG_INT(UiPage, ui_page, 6, 0, 11, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Interface page") MACRO_CONFIG_INT(UiToolboxPage, ui_toolbox_page, 0, 0, 2, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Toolbox page") @@ -101,13 +101,13 @@ MACRO_CONFIG_INT(UiColorizeGametype, ui_colorize_gametype, 1, 0, 1, CFGFLAG_CLIE MACRO_CONFIG_INT(GfxNoclip, gfx_noclip, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Disable clipping") // dummy -MACRO_CONFIG_STR(DummyName, dummy_name, 16, "brainless tee", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Name of the Dummy") -MACRO_CONFIG_STR(DummyClan, dummy_clan, 12, "", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Clan of the Dummy") -MACRO_CONFIG_INT(DummyCountry, dummy_country, -1, -1, 1000, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Country of the Dummy") -MACRO_CONFIG_INT(DummyUseCustomColor, dummy_use_custom_color, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Toggles usage of custom colors") -MACRO_CONFIG_INT(DummyColorBody, dummy_color_body, 65408, 0, 0xFFFFFF, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Dummy body color") -MACRO_CONFIG_INT(DummyColorFeet, dummy_color_feet, 65408, 0, 0xFFFFFF, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Dummy feet color") -MACRO_CONFIG_STR(DummySkin, dummy_skin, 24, "default", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Dummy skin") +MACRO_CONFIG_STR(ClDummyName, dummy_name, 16, "brainless tee", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Name of the Dummy") +MACRO_CONFIG_STR(ClDummyClan, dummy_clan, 12, "", CFGFLAG_SAVE|CFGFLAG_CLIENT, "Clan of the Dummy") +MACRO_CONFIG_INT(ClDummyCountry, dummy_country, -1, -1, 1000, CFGFLAG_SAVE|CFGFLAG_CLIENT, "Country of the Dummy") +MACRO_CONFIG_INT(ClDummyUseCustomColor, dummy_use_custom_color, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Toggles usage of custom colors") +MACRO_CONFIG_INT(ClDummyColorBody, dummy_color_body, 65408, 0, 0xFFFFFF, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Dummy body color") +MACRO_CONFIG_INT(ClDummyColorFeet, dummy_color_feet, 65408, 0, 0xFFFFFF, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Dummy feet color") +MACRO_CONFIG_STR(ClDummySkin, dummy_skin, 24, "default", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Dummy skin") MACRO_CONFIG_INT(ClDummy, cl_dummy, 0, 0, 1, CFGFLAG_CLIENT, "0 - player / 1 - dummy") MACRO_CONFIG_INT(ClDummyHammer, cl_dummy_hammer, 0, 0, 1, CFGFLAG_CLIENT, "Whether dummy is hammering for a hammerfly") MACRO_CONFIG_INT(ClDummyResetOnSwitch, cl_dummy_resetonswitch, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Whether dummy should stop pressing keys when you switch")