Merge branch 'refactoring'

Author: ClementDreptin

Hayzen/Hayzen.vcxproj

@@ -71,6 +71,8 @@
     </Deploy>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="src\Games\Common\MultiplayerFunctions.h" />
+    <ClInclude Include="src\Games\Common\SpecOpsFunctions.h" />
     <ClInclude Include="src\Elements\Rectangle.h" />
     <ClInclude Include="src\Core\Title.h" />
     <ClInclude Include="src\Core\Menu.h" />
@@ -82,6 +84,7 @@
     <ClInclude Include="src\Games\AlphaMW2\MenuFunctions.h" />
     <ClInclude Include="src\Games\AlphaMW2\AlphaMW2Title.h" />
     <ClInclude Include="src\Games\AlphaMW2\Structs.h" />
+    <ClInclude Include="src\Games\Common\CommonFunctions.h" />
     <ClInclude Include="src\Games\MW2\GameFunctions.h" />
     <ClInclude Include="src\Games\MW2\MenuFunctions.h" />
     <ClInclude Include="src\Games\MW2\MW2Title.h" />

Hayzen/Hayzen.vcxproj.filters

@@ -62,5 +62,8 @@
     <ClInclude Include="src\Games\SpecOps\AlphaMW2\MenuFunctions.h" />
     <ClInclude Include="src\Games\SpecOps\AlphaMW2\SpecOpsAlphaMW2Title.h" />
     <ClInclude Include="src\Games\SpecOps\AlphaMW2\Structs.h" />
+    <ClInclude Include="src\Games\Common\CommonFunctions.h" />
+    <ClInclude Include="src\Games\Common\MultiplayerFunctions.h" />
+    <ClInclude Include="src\Games\Common\SpecOpsFunctions.h" />
   </ItemGroup>
 </Project>

Hayzen/src/Games/AlphaMW2/AlphaMW2Title.cpp

@@ -43,15 +43,15 @@ void AlphaMW2Title::CreateStructure()
     pMain->AddChild(MakeOption("God Mode", 0, AlphaMW2::ToggleGodMode));
     pMain->AddChild(MakeOption("Fall Damage", 1, AlphaMW2::ToggleFallDamage));
     pMain->AddChild(MakeOption("Ammo", 2, AlphaMW2::ToggleAmmo));
-    pMain->AddChild(MakeOption("Spawn Care Package", 3, AlphaMW2::SpawnCP));
+    pMain->AddChild(MakeOption("Spawn Care Package", 3, AlphaMW2::SpawnCarePackage));
     s_RootOption.AddChild(pMain);
 
     // Teleport section
     auto pTeleport = MakeOption("Teleport", 1);
     pTeleport->AddChild(MakeOption("Save/Load Binds", 0, AlphaMW2::ToggleSaveLoadBinds));
     pTeleport->AddChild(MakeOption("Save Position", 1, AlphaMW2::SavePosition));
     pTeleport->AddChild(MakeOption("Load Position", 2, AlphaMW2::LoadPosition));
-    pTeleport->AddChild(MakeOption("UFO", 3, AlphaMW2::ToggleUFO));
+    pTeleport->AddChild(MakeOption("UFO", 3, AlphaMW2::ToggleUfo));
     s_RootOption.AddChild(pTeleport);
 
     // Bot section

Hayzen/src/Games/AlphaMW2/GameFunctions.cpp

@@ -18,8 +18,6 @@ void (*Cbuf_AddText)(int localClientNum, const char *text) = reinterpret_cast<vo
 
 bool (*Dvar_GetBool)(const char *dvarName) = reinterpret_cast<bool(*)(const char *)>(0x82303B00);
 
-float (*Dvar_GetFloat)(const char *dvarName) = reinterpret_cast<float(*)(const char *)>(0x82303BD0);
-
 const char *(*Dvar_GetString)(const char *dvarName) = reinterpret_cast<const char *(*)(const char *)>(0x82303CC0);
 
 playerState_s *(*GetPlayerState)(int clientNum) = reinterpret_cast<playerState_s *(*)(int)>(0x8222C108);

Hayzen/src/Games/AlphaMW2/GameFunctions.h

@@ -17,8 +17,6 @@ extern void (*Cbuf_AddText)(int localClientNum, const char *text);
 
 extern bool (*Dvar_GetBool)(const char *dvarName);
 
-extern float (*Dvar_GetFloat)(const char *dvarName);
-
 extern const char *(*Dvar_GetString)(const char *dvarName);
 
 extern playerState_s *(*GetPlayerState)(int clientNum);

Hayzen/src/Games/AlphaMW2/MenuFunctions.cpp

@@ -3,261 +3,50 @@
 
 using namespace AlphaMW2::Game;
 
+#ifdef COMMON_FN_NAMESPACE
+#undef COMMON_FN_NAMESPACE 
+#endif
+#define COMMON_FN_NAMESPACE AlphaMW2Common
 
-void AlphaMW2::ToggleGodMode(Menu *pMenu)
-{
-    int iClientNum = pMenu->GetClientNum();
+#include "Games\Common\CommonFunctions.h"
+#include "Games\Common\MultiplayerFunctions.h"
 
-    const int GOD_MODE_ON = 4097;
-    const int GOD_MODE_OFF = 4096;
 
-    if (GetEntity(iClientNum)->flags == GOD_MODE_OFF)
-    {
-        GetEntity(iClientNum)->flags = GOD_MODE_ON;
-        iPrintLn(iClientNum, "God Mode ^2On");
-    }
-    else
-    {
-        GetEntity(iClientNum)->flags = GOD_MODE_OFF;
-        iPrintLn(iClientNum, "God Mode ^1Off");
-    }
-}
+void AlphaMW2::ToggleGodMode(Menu *pMenu) { COMMON_FN_NAMESPACE::ToggleGodModeMP(pMenu); }
 
-void AlphaMW2::ToggleFallDamage(Menu *pMenu)
-{
-    int iClientNum = pMenu->GetClientNum();
-
-    if (Dvar_GetFloat("bg_fallDamageMinHeight") == 128.0f)
-    {
-        SetClientDvar(-1, "bg_fallDamageMinHeight", "9998");
-        SetClientDvar(-1, "bg_fallDamageMaxHeight", "9999");
-        iPrintLn(iClientNum, "Fall Damage ^2Off");
-    }
-    else
-    {
-        SetClientDvar(-1, "bg_fallDamageMinHeight", "128");
-        SetClientDvar(-1, "bg_fallDamageMaxHeight", "300");
-        iPrintLn(iClientNum, "Fall Damage ^1On");
-    }
-}
+void AlphaMW2::ToggleFallDamage(Menu *pMenu) { COMMON_FN_NAMESPACE::ToggleFallDamage(pMenu, 0x82023F50); }
 
 void AlphaMW2::ToggleAmmo(Menu *pMenu)
 {
-    int iClientNum = pMenu->GetClientNum();
-
-    if (!Dvar_GetBool("player_sustainAmmo"))
-    {
-        SetClientDvar(-1, "player_sustainAmmo", "1");
-        iPrintLn(iClientNum, "Unlimited Ammo ^2On");
-    }
-    else
-    {
-        SetClientDvar(-1, "player_sustainAmmo", "0");
-        iPrintLn(iClientNum, "Unlimited Ammo ^1Off");
-    }
-}
-
-void AlphaMW2::SpawnCP(Menu *pMenu)
-{
-    int iClientNum = pMenu->GetClientNum();
-
-    gentity_s *currentMapBrushModel = GetCurrentMapBrushModel();
-
-    // Return early if the map is not supported
-    if (!currentMapBrushModel)
-    {
-        iPrintLn(iClientNum, "^1You cannot spawn a Care Package on this map!");
-        return;
-    }
-
-    // Get the player's current position
-    float distance = 150.0f;
-    vec3 origin = GetPlayerState(iClientNum)->origin;
-    float viewY = GetPlayerState(iClientNum)->viewAngles.y;
-
-    // Spawn an entity 150 units in front of the player and oriented towards
-    // where they are looking at
-    gentity_s *entity = G_Spawn();
-    entity->r.currentOrigin = Math::ToFront(origin, viewY, distance);
-    entity->r.currentAngles.y = viewY;
-
-    // Apply the care package mesh to the entity
-    G_SetModel(entity, "com_plasticcase_friendly");
-    SP_script_model(entity);
-    SV_UnlinkEntity(entity);
-    entity->r.bmodel = 4;
-    entity->state.index = currentMapBrushModel->state.index;
-
-    // Make the care package solid
-    int contents = entity->r.contents;
-    SV_SetBrushModel(entity);
-    contents |= entity->r.contents;
-    entity->r.contents = contents;
-
-    // Register the entity for the scene 
-    SV_LinkEntity(entity);
-}
-
-void AlphaMW2::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();
-}
-
-void AlphaMW2::SavePosition(Menu *pMenu)
-{
-    int iClientNum = pMenu->GetClientNum();
-
-    pMenu->SetSavedPos(GetPlayerState(iClientNum)->origin);
-    pMenu->SetSavedAngles(GetPlayerState(iClientNum)->viewAngles);
-
-    iPrintLn(iClientNum, "Position ^2Saved");
-}
-
-void AlphaMW2::LoadPosition(Menu *pMenu)
-{
-    int iClientNum = pMenu->GetClientNum();
-
-    const vec3 &SavedPos = pMenu->GetSavedPos();
-    const vec3 &SavedAngles = pMenu->GetSavedAngles();
-
-    // Make sure the player previously saved their position
-    if (SavedPos.isNull() || SavedAngles.isNull())
-    {
-        iPrintLn(iClientNum, "^1Save a position first!");
-        return;
-    }
-
-    gentity_s *pPlayerEntity = GetEntity(iClientNum);
-
-    SetClientOrigin(pPlayerEntity, reinterpret_cast<const float *>(&SavedPos));
-    SetClientViewAngle(pPlayerEntity, reinterpret_cast<const float *>(&SavedAngles));
-}
-
-void AlphaMW2::ToggleUFO(Menu *pMenu)
-{
-    int iClientNum = pMenu->GetClientNum();
+    COMMON_FN_NAMESPACE::ToggleAmmoOptions Options;
+    Options.pMenu = pMenu;
+    Options.dwPatchAddress = 0x82113628;
+    Options.dwDefaultValue = 0x7D1E4850;
+    Options.dwPatchValue = 0x7D284B78;
 
-    if (GetGClient(iClientNum)->mFlags != 2)
-    {
-        GetGClient(iClientNum)->mFlags = 2;
-        iPrintLn(iClientNum, "Ufo ^2On");
-    }
-    else
-    {
-        GetGClient(iClientNum)->mFlags = 0;
-        iPrintLn(iClientNum, "Ufo ^1Off");
-    }
+    COMMON_FN_NAMESPACE::ToggleAmmo(Options);
 }
 
-// Threaded function that makes the bot pick a team, then pick a class.
-static DWORD SpawnBotThread(Menu *pMenu)
-{
-    Sleep(150);
-
-    // Prepare the commands to send to SV_ExecuteClientCommand
-    int serverId = Memory::Read<int>(0x8355D5C4);
-    std::string strChooseTeamCmd = Formatter::Format("mr %i 4 autoassign", serverId);
-    std::string strChooseClassCmd = Formatter::Format("mr %i 11 class0", serverId);
+void AlphaMW2::SpawnCarePackage(Menu *pMenu) {COMMON_FN_NAMESPACE::SpawnCarePackage(pMenu); }
 
-    // Get the address of the bot to pass to SV_ExecuteClientCommand
-    DWORD dwBotAddr = Memory::Read<DWORD>(0x83577D98) + reinterpret_cast<gentity_s *>(pMenu->GetBot())->state.number * 0x97F80;
+void AlphaMW2::ToggleSaveLoadBinds(Menu *pMenu) { COMMON_FN_NAMESPACE::ToggleSaveLoadBinds(pMenu); }
 
-    // Make the bot choose the opposite team and wait until it's done
-    SV_ExecuteClientCommand(dwBotAddr, strChooseTeamCmd.c_str(), 1, 0);
-    Sleep(150);
+void AlphaMW2::SavePosition(Menu *pMenu) { COMMON_FN_NAMESPACE::SavePosition(pMenu); }
 
-    // Make the bot pick the first custom class and wait until it's done
-    SV_ExecuteClientCommand(dwBotAddr, strChooseClassCmd.c_str(), 1, 0);
-    Sleep(150);
+void AlphaMW2::LoadPosition(Menu *pMenu) { COMMON_FN_NAMESPACE::LoadPosition(pMenu); }
 
-    // Set bot-related dvars to make it completely stand still
-    SetClientDvar(-1, "testClients_doMove", "0");
-    SetClientDvar(-1, "testClients_doAttack", "0");
-    SetClientDvar(-1, "testClients_watchKillcam", "0");
-
-    // Teleport the bot in front of the player
-    AlphaMW2::TeleportBotToMe(pMenu);
-
-    return 0;
-}
+void AlphaMW2::ToggleUfo(Menu *pMenu) { COMMON_FN_NAMESPACE::ToggleUfo(pMenu); }
 
 void AlphaMW2::SpawnBot(Menu *pMenu)
 {
-    gentity_s *pBot = reinterpret_cast<gentity_s *>(pMenu->GetBot());
+    COMMON_FN_NAMESPACE::SpawnBotOptions *pOptions = new COMMON_FN_NAMESPACE::SpawnBotOptions();
+    pOptions->pMenu = pMenu;
+    pOptions->dwServerIdAddress = 0x8355D5C4;
+    pOptions->dwClientsBaseAddress = 0x83577D98;
 
-    // Prevent the user from spawning multiple bots
-    if (pBot)
-    {
-        iPrintLn(pMenu->GetClientNum(), "^1There is already a bot in the game!");
-        return;
-    }
-
-    // Create the bot
-    pBot = SV_AddTestClient();
-    pMenu->SetBot(pBot);
-
-    // The rest of the code needs to execute on a separate thread because we need to
-    // wait between certain operations. If this wasn't done on a separate thread, it
-    // would block the game's thread and make it crash.
-    Memory::Thread(reinterpret_cast<PTHREAD_START_ROUTINE>(SpawnBotThread), pMenu);
+    COMMON_FN_NAMESPACE::SpawnBot(pOptions);
 }
 
-void AlphaMW2::TeleportBotToMe(Menu *pMenu)
-{
-    int iClientNum = pMenu->GetClientNum();
-
-    gentity_s *pBot = reinterpret_cast<gentity_s *>(pMenu->GetBot());
+void AlphaMW2::TeleportBotToMe(Menu *pMenu) { COMMON_FN_NAMESPACE::TeleportBotToMe(pMenu); }
 
-    // Make sure there is a bot in the game
-    if (!pBot)
-    {
-        iPrintLn(iClientNum, "^1There is no bot in the game!");
-        return;
-    }
-
-    // Get the player's current position
-    float fDistance = 100.0f;
-    vec3 Origin = GetPlayerState(iClientNum)->origin;
-    float fViewY = GetPlayerState(iClientNum)->viewAngles.y;
-
-    // Teleport the bot in front of the player
-    pBot->client->ps.origin = Math::ToFront(Origin, fViewY, fDistance);
-}
-
-void AlphaMW2::ToggleBotMovement(Menu *pMenu)
-{
-    int iClientNum = pMenu->GetClientNum();
-
-    gentity_s *pBot = reinterpret_cast<gentity_s *>(pMenu->GetBot());
-
-    // Make sure there is a bot in the game
-    if (!pBot)
-    {
-        iPrintLn(iClientNum, "^1There is no bot in the game!");
-        return;
-    }
-
-    if (Dvar_GetBool("testClients_doMove"))
-    {
-        SetClientDvar(-1, "testClients_doMove", "0");
-        iPrintLn(iClientNum, "Bot ^2Frozen");
-    }
-    else
-    {
-        SetClientDvar(-1, "testClients_doMove", "1");
-        iPrintLn(iClientNum, "Bot ^1Unfrozen");
-    }
-}
+void AlphaMW2::ToggleBotMovement(Menu *pMenu) { COMMON_FN_NAMESPACE::ToggleBotMovement(pMenu); }

Hayzen/src/Games/AlphaMW2/MenuFunctions.h

@@ -7,37 +7,26 @@
 namespace AlphaMW2
 {
 
-// Toggle God Mode.
 void ToggleGodMode(Menu *pMenu);
 
-// Toggle fall damage.
 void ToggleFallDamage(Menu *pMenu);
 
-// Toggle unlimited ammo.
 void ToggleAmmo(Menu *pMenu);
 
-// Spawn a care package.
-void SpawnCP(Menu *pMenu);
+void SpawnCarePackage(Menu *pMenu);
 
-// Toggle save and load binds.
 void ToggleSaveLoadBinds(Menu *pMenu);
 
-// Save the current player's position.
 void SavePosition(Menu *pMenu);
 
-// Load the previously saved player's position.
 void LoadPosition(Menu *pMenu);
 
-// Toggle UFO.
-void ToggleUFO(Menu *pMenu);
+void ToggleUfo(Menu *pMenu);
 
-// Spawn a bot.
 void SpawnBot(Menu *pMenu);
 
-// Teleport the bot in front of the player.
 void TeleportBotToMe(Menu *pMenu);
 
-// Toggle the bot's movement.
 void ToggleBotMovement(Menu *pMenu);
 
 }