Unbound LB and RB while save and load binds are enabled to prevent the player from throwing grenades while using save and load

ClementDreptin · ClementDreptin · commit 3cc79c4d882d · 2022-01-25T19:52:28.000+01:00
diff --git a/Hayzen/src/Games/Alpha/MW2/GameFunctions.cpp b/Hayzen/src/Games/Alpha/MW2/GameFunctions.cpp
@@ -12,6 +12,8 @@ const char *(*SL_ConvertToString)(uint32_t stringValue) = reinterpret_cast<const
 
 void (*SV_GameSendServerCommand)(int clientNum, int type, const char *text) = reinterpret_cast<void(*)(int, int, const char *)>(0x822B6140);
 
+void (*Cbuf_AddText)(int localClientNum, const char *text) = reinterpret_cast<void(*)(int, const char *)>(0x8226F590);
+
 bool (*Dvar_GetBool)(const char *dvarName) = reinterpret_cast<bool(*)(const char *)>(0x82303B00);
 
 float (*Dvar_GetFloat)(const char *dvarName) = reinterpret_cast<float(*)(const char *)>(0x82303BD0);
diff --git a/Hayzen/src/Games/Alpha/MW2/GameFunctions.h b/Hayzen/src/Games/Alpha/MW2/GameFunctions.h
@@ -13,6 +13,8 @@ extern const char *(*SL_ConvertToString)(uint32_t stringValue);
 
 extern void (*SV_GameSendServerCommand)(int clientNum, int type, const char *text);
 
+extern void (*Cbuf_AddText)(int localClientNum, const char *text);
+
 extern bool (*Dvar_GetBool)(const char *dvarName);
 
 extern float (*Dvar_GetFloat)(const char *dvarName);
diff --git a/Hayzen/src/Games/Alpha/MW2/MenuFunctions.cpp b/Hayzen/src/Games/Alpha/MW2/MenuFunctions.cpp
@@ -103,9 +103,15 @@ void AlphaMW2MenuFunctions::ToggleSaveLoadBinds(Menu *pMenu)
     int iClientNum = pMenu->GetClientNum();
 
     if (!pMenu->BindsEnabled())
+    {
+        Cbuf_AddText(0, "unbind button_lshldr;unbind button_rshldr");
         iPrintLn(iClientNum, "Press " CHAR_RB " to ^2Save^7 and " CHAR_LB " to ^2Load");
+    }
     else
+    {
+        Cbuf_AddText(0, "bind button_lshldr \"+smoke\";bind button_rshldr \"+frag\"");
         iPrintLn(iClientNum, "Save and Load binds ^1Off");
+    }
 
     pMenu->ToggleBinds();
 }
diff --git a/Hayzen/src/Games/MW2/GameFunctions.cpp b/Hayzen/src/Games/MW2/GameFunctions.cpp
@@ -12,6 +12,8 @@ const char *(*SL_ConvertToString)(uint32_t stringValue) = reinterpret_cast<const
 
 void (*SV_GameSendServerCommand)(int clientNum, int type, const char *text) = reinterpret_cast<void(*)(int, int, const char *)>(0x822548D8);
 
+void (*Cbuf_AddText)(int localClientNum, const char *text) = reinterpret_cast<void(*)(int, const char *)>(0x82224990);
+
 bool (*Dvar_GetBool)(const char *dvarName) = reinterpret_cast<bool(*)(const char *)>(0x8229EEE8);
 
 const char *(*Dvar_GetString)(const char *dvarName) = reinterpret_cast<const char *(*)(const char *)>(0x8229F0A8);
diff --git a/Hayzen/src/Games/MW2/GameFunctions.h b/Hayzen/src/Games/MW2/GameFunctions.h
@@ -13,6 +13,8 @@ extern const char *(*SL_ConvertToString)(uint32_t stringValue);
 
 extern void (*SV_GameSendServerCommand)(int clientNum, int type, const char *text);
 
+extern void (*Cbuf_AddText)(int localClientNum, const char *text);
+
 extern bool (*Dvar_GetBool)(const char *dvarName);
 
 extern const char *(*Dvar_GetString)(const char *dvarName);
diff --git a/Hayzen/src/Games/MW2/MenuFunctions.cpp b/Hayzen/src/Games/MW2/MenuFunctions.cpp
@@ -154,9 +154,15 @@ void MW2MenuFunctions::ToggleSaveLoadBinds(Menu *pMenu)
     int iClientNum = pMenu->GetClientNum();
 
     if (!pMenu->BindsEnabled())
+    {
+        Cbuf_AddText(0, "unbind button_lshldr;unbind button_rshldr");
         iPrintLn(iClientNum, "Press " CHAR_RB " to ^2Save^7 and " CHAR_LB " to ^2Load");
+    }
     else
+    {
+        Cbuf_AddText(0, "bind button_lshldr \"+smoke\";bind button_rshldr \"+frag\"");
         iPrintLn(iClientNum, "Save and Load binds ^1Off");
+    }
 
     pMenu->ToggleBinds();
 }
diff --git a/Hayzen/src/Games/MW3/GameFunctions.cpp b/Hayzen/src/Games/MW3/GameFunctions.cpp
@@ -12,6 +12,8 @@ const char *(*SL_ConvertToString)(uint32_t stringValue) = reinterpret_cast<const
 
 void (*SV_GameSendServerCommand)(int clientNum, int type, const char *text) = reinterpret_cast<void(*)(int, int, const char *)>(0x822C9340);
 
+void (*Cbuf_AddText)(int localClientNum, const char *text) = reinterpret_cast<void(*)(int, const char *)>(0x82287F68);
+
 const char *(*Dvar_GetString)(const char *dvarName) = reinterpret_cast<const char *(*)(const char *)>(0x8232E488);
 
 clientState_s *(*GetClientState)(int clientNum) = reinterpret_cast<clientState_s *(*)(int)>(0x82244130);
diff --git a/Hayzen/src/Games/MW3/GameFunctions.h b/Hayzen/src/Games/MW3/GameFunctions.h
@@ -13,6 +13,8 @@ extern const char *(*SL_ConvertToString)(uint32_t stringValue);
 
 extern void (*SV_GameSendServerCommand)(int clientNum, int type, const char *text);
 
+extern void (*Cbuf_AddText)(int localClientNum, const char *text);
+
 extern const char *(*Dvar_GetString)(const char *dvarName);
 
 extern clientState_s *(*GetClientState)(int clientNum);
diff --git a/Hayzen/src/Games/MW3/MenuFunctions.cpp b/Hayzen/src/Games/MW3/MenuFunctions.cpp
@@ -107,9 +107,15 @@ void MW3MenuFunctions::ToggleSaveLoadBinds(Menu *pMenu)
     int iClientNum = pMenu->GetClientNum();
 
     if (!pMenu->BindsEnabled())
+    {
+        Cbuf_AddText(0, "unbind button_lshldr;unbind button_rshldr");
         iPrintLn(iClientNum, "Press " CHAR_RB " to ^2Save^7 and " CHAR_LB " to ^2Load");
+    }
     else
+    {
+        Cbuf_AddText(0, "bind button_lshldr \"+smoke\";bind button_rshldr \"+frag\"");
         iPrintLn(iClientNum, "Save and Load binds ^1Off");
+    }
 
     pMenu->ToggleBinds();
 }
diff --git a/Hayzen/src/Games/SpecOps/MW2/MW2.cpp b/Hayzen/src/Games/SpecOps/MW2/MW2.cpp
@@ -54,6 +54,7 @@ void SpecOpsMW2::CreateStructure()
     pTeleport->AddChild(MakeOption("UFO", 3, SpecOpsMW2MenuFunctions::ToggleUFO));
     s_RootOption.AddChild(pTeleport);
 
+    // Second player section
     auto pSecondPlayer = MakeOption("Second Player", 2);
     pSecondPlayer->AddChild(MakeOption("God Mode", 0, SpecOpsMW2MenuFunctions::ToggleSecondPlayerGodMode));
     pSecondPlayer->AddChild(MakeOption("Teleport to Me", 1, SpecOpsMW2MenuFunctions::TeleportSecondPlayerToMe));
diff --git a/Hayzen/src/Games/SpecOps/MW2/MenuFunctions.cpp b/Hayzen/src/Games/SpecOps/MW2/MenuFunctions.cpp
@@ -47,9 +47,15 @@ void SpecOpsMW2MenuFunctions::ToggleSaveLoadBinds(Menu *pMenu)
     int iClientNum = pMenu->GetClientNum();
 
     if (!pMenu->BindsEnabled())
+    {
+        Cbuf_AddText(0, "unbind button_lshldr;unbind button_rshldr");
         iPrintLn(iClientNum, "Press " CHAR_RB " to ^2Save^7 and " CHAR_LB " to ^2Load");
+    }
     else
+    {
+        Cbuf_AddText(0, "bind button_lshldr \"+smoke\";bind button_rshldr \"+frag\"");
         iPrintLn(iClientNum, "Save and Load binds ^1Off");
+    }
 
     pMenu->ToggleBinds();
 }
diff --git a/Hayzen/src/Games/SpecOps/MW3/GameFunctions.cpp b/Hayzen/src/Games/SpecOps/MW3/GameFunctions.cpp
@@ -7,6 +7,8 @@ namespace SpecOpsMW3GameFunctions
 
 void (*SV_GameSendServerCommand)(int clientNum, const char *text) = reinterpret_cast<void(*)(int, const char *)>(0x82371680);
 
+void (*Cbuf_AddText)(int localClientNum, const char *text) = reinterpret_cast<void(*)(int, const char *)>(0x8228E1F8);
+
 playerState_s *(*SV_GetPlayerstateForClientNum)(int num) = reinterpret_cast<playerState_s *(*)(int)>(0x82371650);
 
 void (*TeleportPlayer)(gentity_s *player, const float *origin, const float *angles) = reinterpret_cast<void(*)(gentity_s *, const float *, const float *)>(0x8220C960);
diff --git a/Hayzen/src/Games/SpecOps/MW3/GameFunctions.h b/Hayzen/src/Games/SpecOps/MW3/GameFunctions.h
@@ -11,6 +11,8 @@ namespace SpecOpsMW3GameFunctions
 
 extern void (*SV_GameSendServerCommand)(int clientNum, const char *text);
 
+extern void (*Cbuf_AddText)(int localClientNum, const char *text);
+
 extern playerState_s *(*SV_GetPlayerstateForClientNum)(int num);
 
 extern void (*TeleportPlayer)(gentity_s *player, const float *origin, const float *angles);
diff --git a/Hayzen/src/Games/SpecOps/MW3/MW3.cpp b/Hayzen/src/Games/SpecOps/MW3/MW3.cpp
@@ -55,6 +55,7 @@ void SpecOpsMW3::CreateStructure()
     pTeleport->AddChild(MakeOption("UFO", 3, SpecOpsMW3MenuFunctions::ToggleUFO));
     s_RootOption.AddChild(pTeleport);
 
+    // Second player section
     auto pSecondPlayer = MakeOption("Second Player", 2);
     pSecondPlayer->AddChild(MakeOption("God Mode", 0, SpecOpsMW3MenuFunctions::ToggleSecondPlayerGodMode));
     pSecondPlayer->AddChild(MakeOption("Teleport to Me", 1, SpecOpsMW3MenuFunctions::TeleportSecondPlayerToMe));
diff --git a/Hayzen/src/Games/SpecOps/MW3/MenuFunctions.cpp b/Hayzen/src/Games/SpecOps/MW3/MenuFunctions.cpp
@@ -47,9 +47,15 @@ void SpecOpsMW3MenuFunctions::ToggleSaveLoadBinds(Menu *pMenu)
     int iClientNum = pMenu->GetClientNum();
 
     if (!pMenu->BindsEnabled())
+    {
+        Cbuf_AddText(0, "unbind button_lshldr;unbind button_rshldr");
         iPrintLn(iClientNum, "Press " CHAR_RB " to ^2Save^7 and " CHAR_LB " to ^2Load");
+    }
     else
+    {
+        Cbuf_AddText(0, "bind button_lshldr \"+smoke\";bind button_rshldr \"+frag\"");
         iPrintLn(iClientNum, "Save and Load binds ^1Off");
+    }
 
     pMenu->ToggleBinds();
 }
