Merge pull request #4 from 0xNULLderef/feat/class-reorg-change-offsets

`Signatures` implementation and cleanup

Author: OrsellGit

README.md

@@ -14,8 +14,8 @@
 > 2. Compatibility will not be 100%, so expect bugs or other issues.
 > 3. If you are using this plugin with your mod, I am not responsible if anything bad happens to your mod's page on Steam.
 >
-> Ideally, if you wish to have some of these features but want to be able to have your mod on Steam, wait for P2:CE to release rather than using this. 
-> 
+> Ideally, if you wish to have some of these features but want to be able to have your mod on Steam, wait for P2:CE to release rather than using this.
+>
 > I will, in the future, try to add custom elements involving interactions with Steam's API, like achievements, but for now, I don't expect this to work correctly with Steam mods. Plus, in the end, P2:CE will do this properly in the future.
 
 ### Features Implemented/Potentially Plan to Implement:

src/commands.cpp

@@ -26,12 +26,12 @@ static void ChangePtexVolumetricState(IConVar* var, const char* pOldValue, float
     if (dynamic_cast<ConVar*>(var)->GetBool())
     {
         Log(INFO, false, "Enabled volumetrics for projected textures...");
-        Memory::ReplacePattern("engine", Signature::CShadowMgr_DrawVolumetrics_VolState, Signature::CShadowMgr_DrawVolumetrics_VolState_Patch);
+        Memory::ReplacePattern("engine", Signatures::CShadowMgr_DrawVolumetrics_VolState, Signatures::CShadowMgr_DrawVolumetrics_VolState_Patch);
     }
     else
     {
         Log(INFO, false, "Disabled volumetrics for projected textures...");
-        Memory::ReplacePattern("engine", Signature::CShadowMgr_DrawVolumetrics_VolState_Patch, Signature::CShadowMgr_DrawVolumetrics_VolState);
+        Memory::ReplacePattern("engine", Signatures::CShadowMgr_DrawVolumetrics_VolState_Patch, Signatures::CShadowMgr_DrawVolumetrics_VolState);
     }
 }
 ConVar p2sm_ptex_volumetrics("p2sm_ptex_volumetrics", "0", FCVAR_NONE, "Enable or disable volumetrics for projected textures.", ChangePtexVolumetricState);
@@ -52,21 +52,21 @@ CON_COMMAND(p2sm_spmaplist, "")
 {
     // BF F0 2D 94 10 84 DB
     // GetNumChapters: 55 8B EC 80 7D ?? ?? 57 74
-    
+
     //uintptr_t GetNumChapters = *static_cast<uintptr_t*>(Memory::Scanner::Scan<void*>(CLIENT, "55 8B EC 80 7D 08 00 57 74 0C", 0));//16));
     ChapterContext_t** chapterArrayPtr = Memory::Scan<ChapterContext_t**>(MODULE_CLIENT, "55 8B EC 80 7D 08 00 57 74 0C", 16);
     const ChapterContext_t* chapterArray = *chapterArrayPtr;
     // chapterArray = *reinterpret_cast<ChapterContext_t*>(tempChapterArray + 16);
     //chapterArray = reinterpret_cast<ChapterContext_t*>(GetNumChapters + 16);
     //chapterArray = static_cast<ChapterContext_t*>(Memory::Scanner::Scan<void*>(CLIENT, "B8 F0 A8 93 10 8D 64 24", 0));
 
-    
+
     if (!chapterArrayPtr)
     {
         Log(WARNING, false, "Failed to get chapterArray!");
         return;
     }
-	
+
     for (int i = 0; chapterArray[i].mapName != nullptr; i++)
     {
         Log(INFO, false, "Map: %s, Chapter: %d, Subchapter: %d\n",
@@ -80,5 +80,5 @@ CON_COMMAND(p2sm_spmaplist, "")
 
     *chapterArrayPtr = newChapters;
 
-    
-}
+
+}

src/globals.hpp

@@ -2,7 +2,7 @@
 //
 // Author: Orsell
 // Purpose: Global functions & variables used repeatedly throughout the plugin
-// 
+//
 //===========================================================================//
 
 #pragma once
@@ -14,7 +14,7 @@
 #include "public/steam/steamclientpublic.h"
 #include "irecipientfilter.h"
 
-#include <comdef.h> 
+#include <comdef.h>
 
 #define CUR_MAPFILE_NAME STRING(g_pGlobals->mapname)
 #define MAX_PLAYERS g_pGlobals->maxClients
@@ -39,7 +39,7 @@ enum PlayerTeam : std::uint8_t
 {
 	TEAM_SINGLEPLAYER = 0,
 	TEAM_SPECTATOR,
-	TEAM_RED,  
+	TEAM_RED,
 	TEAM_BLUE
 };
 
@@ -92,4 +92,4 @@ class CPlayerFilter : public IRecipientFilter
 private:
 	int recipients[256];
 	int recipientCount;
-};
+};

src/modules/cbaseentity.cpp

@@ -24,7 +24,7 @@ void CBaseEntity::RemoveEntity(CBaseEntity* pEntity)
 {
     if (!pEntity)
         return;
-    
+
     static auto removeEntity = reinterpret_cast<void (__cdecl*)(void*)>(Memory::Scan<void*>(MODULE_SERVER, "55 8B EC 57 8B 7D 08 85 FF 74 72"));
     removeEntity((reinterpret_cast<IServerEntity*>(pEntity)->GetNetworkable()));
 }
@@ -66,7 +66,7 @@ HSCRIPT CBaseEntity::GetScriptInstance(CBaseEntity* entity)
  * @param filter Filter of recipient entities that can hear this noise.
  * @param soundName Sound file path, or script name to play.
  * @param pOrigin Position in the world the sound will play.
- * @param soundTime Time in seconds till sound is played. NOT HOW LONG SOUND WILL PLAY! 
+ * @param soundTime Time in seconds till sound is played. NOT HOW LONG SOUND WILL PLAY!
  * @return Return code for sound.
  */
 int CBaseEntity::EmitSound(CBaseEntity* pEntity, int entityIndex, IRecipientFilter& filter, const char* soundName, const Vector* pOrigin, const float soundTime)

src/modules/cbaseentity.hpp

@@ -27,7 +27,7 @@ class CBaseEntity
     static int EmitSound(CBaseEntity* pEntity, int entityIndex, IRecipientFilter& filter, const char* soundName, const Vector* pOrigin, float soundTime);
     static void AddEffects(CBaseEntity* pEntity, int nEffects);
     static void RemoveEffects(CBaseEntity* pEntity, int nEffects);
-    
+
 #pragma endregion
 
 private: // MARK: CBaseEntity Private Members

src/modules/cbaseplayer.hpp

@@ -18,12 +18,12 @@ class CBasePlayer
 #pragma region Public Members
 
     static void ShowViewPortPanel(int playerIndex, const char* name, bool bShow, KeyValues* data);
-    
+
 #pragma endregion
 
 private: // MARK: CBasePlayer Private Members
 #pragma region Private Members
 #pragma endregion
 };
 
-#endif
+#endif

src/modules/cportal_player.cpp

@@ -56,9 +56,9 @@ DETOUR_T(bool, CPortal_Player::FlashlightTurnOn, bool playSound)
 		Log(WARNING, false, "CPortal_Player::FlashlightTurnOn was called with a invalid player!");
 		return false;
 	}
-	
+
 	CPortal_Player::SetFlashlightState(playerIndex, true);
-	
+
 	CPlayerFilter filter;
 	filter.AddPlayer(playerIndex);
 	CBaseEntity::EmitSound(pEntity, playerIndex, filter, "HL2Player.FlashLightOn", nullptr, 0.0f);
@@ -80,9 +80,9 @@ DETOUR_T(void, CPortal_Player::FlashlightTurnOff, bool playSound)
 		Log(WARNING, false, "CPortal_Player::FlashlightTurnOff was called with a invalid player!");
 		return;
 	}
-	
+
 	CPortal_Player::SetFlashlightState(playerIndex, false);
-	
+
 	CPlayerFilter filter;
 	filter.AddPlayer(playerIndex);
 	CBaseEntity::EmitSound(pEntity, playerIndex, filter, "HL2Player.FlashLightOff", nullptr, 0.0f);

src/modules/cportal_player.hpp

@@ -44,12 +44,12 @@ class CPortal_Player
 
     static void RespawnPlayer(int playerEntityIndex);
     static void SetFlashlightState(int playerEntityIndex, bool enabled);
-    
+
 #pragma endregion
 
 private: // MARK: CPortal_Player Private Members
 #pragma region Private Members
 #pragma endregion
 };
 
-#endif
+#endif

src/modules/gui.cpp

@@ -19,7 +19,7 @@ bool GeneralGUI::InitializeGUISystems()
         Log(WARNING, false, "Failed to get window handle!");
         return false;
     }
-    
+
     // Log(INFO, true, "Starting ImGUI...");
     // if (!ImGui::Init())
     // {
@@ -64,7 +64,7 @@ bool ImGui::Init()
         deviceAddressPtr = Memory::Scan(MODULE_SHADERAPIDX9, "A1 ? ? ? ? 6A 00", 1);
     else
         deviceAddressPtr = Memory::Scan(MODULE_APIVULKAN, "A1 ? ? ? ? 56 84 DB", 1);
-        
+
     if (!deviceAddressPtr)
     {
         assert(0 && "Failed to get address pointer to the DirectX9 device!");
@@ -86,7 +86,7 @@ bool ImGui::Init()
     Log(INFO, false, "Present %p", Present);
 
     // TODO: Add ImGui initialization calls here.
-    
+
     return true;
 }
 
@@ -97,4 +97,4 @@ void ImGui::Shutdown()
 
 HWND GeneralGUI::hWnd = nullptr;
 IDirect3DDevice9* ImGui::g_pDXDevice = nullptr;
-void* ImGui::Present = nullptr;
+void* ImGui::Present = nullptr;

src/modules/gui.hpp

@@ -26,9 +26,9 @@ class GeneralGUI
 
 
     static bool InitializeGUISystems();
-    
+
     static HWND GetWindowHandle();
-    
+
 #pragma endregion
 
 private: // MARK: WindowsGUI Private Members
@@ -58,23 +58,23 @@ class ImGui
 {
 public: // MARK: ImGui Public Members
 #pragma region Public Members 
-    
+
     static bool Init();
     static void Shutdown();
 
 #pragma endregion
-    
+
 private: // MARK: ImGui Private Members
 #pragma region Private Members
-    
+
 #ifdef _WIN32
     static IDirect3DDevice9* g_pDXDevice;
 #else
     // TODO: Implement SDL and Vulkan devices
 #endif
-    
+
     static void* Present;
-    
+
 
 #pragma endregion
 };