feat: Moved more signatures to signature file, added function types, and fixed some naming schemes.

Author: OrsellGit

src/modules/cbaseentity.cpp

@@ -8,48 +8,49 @@
 #include "stdafx.hpp"
 #include "modules/cbaseentity.hpp"
 
-#include "modules/cbaseplayer.hpp"
-
 #include "utils.hpp"
 #include "globals.hpp"
-
-#include "vscript/ivscript.h"
-#include "irecipientfilter.h"
+#include "signatures.hpp"
 
 /**
  * @brief Remove a entity from the world.
- * @param pEntity Pointer to entity.
+ * @param entity Pointer to entity.
  */
-void CBaseEntity::RemoveEntity(CBaseEntity* pEntity)
+using RemoveEntityT = void (__cdecl*)(CBaseEntity*);
+void CBaseEntity::RemoveEntity(CBaseEntity* entity)
 {
-    if (!pEntity)
+    if (!entity)
         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()));
+    static auto removeEntity = Memory::Scan<RemoveEntityT>(MODULE_SERVER, Signatures::RemoveEntity);
+    removeEntity(entity);
 }
 
 /**
  * @brief Get the script scope of a entity.
- * @param pEntity Pointer to entity.
+ * @param entity Pointer to entity.
  * @return VScript handle to entity's script scope.
  */
-HSCRIPT CBaseEntity::GetScriptScope(CBaseEntity* pEntity)
+HSCRIPT CBaseEntity::GetScriptScope(CBaseEntity* entity)
 {
-    if (!pEntity)
+    if (!entity)
         return nullptr;
 
-    return *reinterpret_cast<HSCRIPT*>(reinterpret_cast<uintptr_t>(pEntity) + 0x33C);
+    return *reinterpret_cast<HSCRIPT*>(reinterpret_cast<uintptr_t>(entity) + 0x33C);
 }
 
 /**
  * @brief Get the script instance of a entity.
  * @param entity Pointer to entity.
  * @return VScript instance handle of the entity.
  */
+using GetScriptInstanceT = HSCRIPT (__thiscall*)(CBaseEntity*);
 HSCRIPT CBaseEntity::GetScriptInstance(CBaseEntity* entity)
 {
-    static auto getScriptInstance = reinterpret_cast<HSCRIPT (__thiscall*)(CBaseEntity*)>(Memory::Scan<void*>(MODULE_SERVER, "55 8B EC 51 56 8B F1 83 BE 50"));
+    if (!entity)
+        return nullptr;
+
+    static auto getScriptInstance = Memory::Scan<GetScriptInstanceT>(MODULE_SERVER, Signatures::GetScriptInstance);
     if (!getScriptInstance)
     {
         Log(WARNING, false, "Could not get script instance for entity!");
@@ -61,30 +62,50 @@ HSCRIPT CBaseEntity::GetScriptInstance(CBaseEntity* entity)
 
 /**
  * @brief Make a entity emit a sound.
- * @param pEntity Entity that will call to emit a sound.
+ * @param entity Entity that will call to emit a sound.
  * @param entityIndex Entity that will emit the sound. Use -1 if you want to set a position in the world for it to play.
  * @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 origin Position in the world the 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)
+using EmitSoundT = int (__thiscall*)(CBaseEntity*, IRecipientFilter&, int, const char*, const Vector*, float);
+int CBaseEntity::EmitSound(CBaseEntity* entity, const int entityIndex, IRecipientFilter& filter, const char* soundName, const Vector* origin, const float soundTime)
 {
-    static auto emitSound = reinterpret_cast<int (__thiscall*)(CBaseEntity*, IRecipientFilter&, int, const char*, const Vector*, float)>(Memory::Scan<void*>(MODULE_SERVER, "55 8B EC 83 EC 4C 8B 0D"));
-    return emitSound(pEntity, filter, entityIndex, soundName, pOrigin, soundTime);
-}
+    if (!entity)
+        return 0;
 
-void CBaseEntity::AddEffects(CBaseEntity* pEntity, int nEffects)
-{
-    static auto addEffects = reinterpret_cast<void (__thiscall*)(CBaseEntity*, int)>(Memory::Scan<void*>(MODULE_SERVER, "55 8B EC 53 8B D9 8B 83 A8"));
-    addEffects(pEntity, nEffects);
+    static auto emitSound = Memory::Scan<EmitSoundT>(MODULE_SERVER, Signatures::EmitSound);
+    return emitSound(entity, filter, entityIndex, soundName, origin, soundTime);
 }
 
-void CBaseEntity::RemoveEffects(CBaseEntity* pEntity, int nEffects)
+/**
+ * @brief Add effects to a entity.
+ * @param entity Entity to add effects to.
+ * @param effects Effects to apply on entity.
+ */
+using AddEffectsT = void (__thiscall*)(CBaseEntity*, int);
+void CBaseEntity::AddEffects(CBaseEntity* entity, const EntityEffect effects)
 {
-    static auto removeEffects = reinterpret_cast<void (__thiscall*)(CBaseEntity*, int)>(Memory::Scan<void*>(MODULE_SERVER, "55 8B EC 53 56 8B 75 08 8B D9 8B 83"));
-    removeEffects(pEntity, nEffects);
+    if (!entity)
+        return;
+
+    static auto addEffects = Memory::Scan<AddEffectsT>(MODULE_SERVER, Signatures::AddEffects);
+    addEffects(entity, effects);
 }
 
+/**
+ * @brief Remove effects from a entity.
+ * @param entity Entity to remove effects from.
+ * @param effects Effects to remove from entity.
+ */
+using RemoveEffectsT = void (__thiscall*)(CBaseEntity*, int);
+void CBaseEntity::RemoveEffects(CBaseEntity* entity, const EntityEffect effects)
+{
+    if (!entity)
+        return;
 
+    static auto removeEffects = Memory::Scan<RemoveEffectsT>(MODULE_SERVER, Signatures::RemoveEffects);
+    removeEffects(entity, effects);
+}

src/modules/cbaseentity.hpp

@@ -16,17 +16,42 @@ class CBasePlayer;
 struct Edict;
 typedef struct HSCRIPT__* HSCRIPT;
 
+// Entity effects used with AddEffects and RemoveEffects.
+enum EntityEffect : std::uint16_t
+{
+    EF_BONEMERGE			        = 0x001,	// Performs bone merge on client side
+    EF_BRIGHTLIGHT 			        = 0x002,	// DLIGHT centered at entity origin
+    EF_DIMLIGHT 			        = 0x004,	// player flashlight
+    EF_NOINTERP				        = 0x008,	// don't interpolate the next frame
+    EF_NOSHADOW				        = 0x010,	// Don't cast no shadow
+    EF_NODRAW				        = 0x020,	// don't draw entity
+    EF_NORECEIVESHADOW		        = 0x040,	// Don't receive no shadow
+    EF_BONEMERGE_FASTCULL	        = 0x080,	// For use with EF_BONEMERGE. If this is set, then it places this ent's origin at its
+                                                // parent and uses the parent's bbox + the max extents of the aiment.
+                                                // Otherwise, it sets up the parent's bones every frame to figure out where to place
+                                                // the aiment, which is inefficient because it'll setup the parent's bones even if
+                                                // the parent is not in the PVS.
+    EF_ITEM_BLINK			        = 0x100,	// blink an item so that the user notices it.
+    EF_PARENT_ANIMATES		        = 0x200,	// always assume that the parent entity is animating
+    EF_MARKED_FOR_FAST_REFLECTION	= 0x400,	// marks an entity for reflection rendering when using $reflectonlymarkedentities material variable
+    EF_NOSHADOWDEPTH		        = 0x800,	// Indicates this entity does not render into any shadow depthmap
+    EF_SHADOWDEPTH_NOCACHE	        = 0x1000,	// Indicates this entity cannot be cached in shadow depthmap and should render every frame
+    EF_NOFLASHLIGHT                 = 0x2000,
+    EF_NOCSM				        = 0x4000,	// Indicates this entity does not render into the cascade shadow depthmap
+    EF_MAX_BITS = 15
+};
+
 class CBaseEntity
 {
 public: // MARK: CBaseEntity Public Members
 #pragma region Public Members
 
-    static void RemoveEntity(CBaseEntity* pEntity);
-    static HSCRIPT GetScriptScope(CBaseEntity* pEntity);
-    static HSCRIPT GetScriptInstance(CBaseEntity* entity);
-    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);
+    static void     RemoveEntity(CBaseEntity* entity);
+    static HSCRIPT  GetScriptScope(CBaseEntity* entity);
+    static HSCRIPT  GetScriptInstance(CBaseEntity* entity);
+    static int      EmitSound(CBaseEntity* entity, int entityIndex, IRecipientFilter& filter, const char* soundName, const Vector* origin, float soundTime);
+    static void     AddEffects(CBaseEntity* entity, EntityEffect effects);
+    static void     RemoveEffects(CBaseEntity* entity, EntityEffect effects);
 
 #pragma endregion
 

src/modules/cbaseplayer.cpp

@@ -8,16 +8,22 @@
 #include "stdafx.hpp"
 #include "modules/cbaseplayer.hpp"
 
+#include "signatures.hpp"
 #include "utils.hpp"
 
-void CBasePlayer::ShowViewPortPanel(const int playerIndex, const char* name, const bool bShow, KeyValues* data)
+/**
+ * @brief Show or hide viewports for players.
+ * @param player Player entity.
+ * @param name Viewport to show.
+ * @param show Whether to show or hide the viewport.
+ * @param data Any additional data that would go with certain viewports.
+ */
+using ShowViewPortPanelT = void (__thiscall*)(CBasePlayer*, const char*, bool, KeyValues*);
+void CBasePlayer::ShowViewPortPanel(CBasePlayer* player, const char* name, const bool show, KeyValues* data)
 {
-    CBasePlayer* pPlayer = Utils::PlayerByIndex(playerIndex);
-    if (!pPlayer)
-    {
-        Log(WARNING, false, "Couldn't get player to display view port panel to! playerIndex: %i", playerIndex);
+    if (!player)
         return;
-    }
-    static auto showViewPortPanel = reinterpret_cast<void(__thiscall*)(CBasePlayer*, const char*, bool, KeyValues*)>(Memory::Scan<void*>(MODULE_SERVER, "55 8B EC 83 EC 20 53 56 8B F1 57 8D 4D ? E8 ? ? ? ? 56"));
-    showViewPortPanel(pPlayer, name, bShow, data);
+
+    static auto showViewPortPanel = Memory::Scan<ShowViewPortPanelT>(MODULE_SERVER, Signatures::ShowViewPortPanel);
+    showViewPortPanel(player, name, show, data);
 }

src/modules/cbaseplayer.hpp

@@ -17,7 +17,7 @@ class CBasePlayer
 public: // MARK: CBasePlayer Public Members
 #pragma region Public Members
 
-    static void ShowViewPortPanel(int playerIndex, const char* name, bool bShow, KeyValues* data);
+    static void ShowViewPortPanel(CBasePlayer* player, const char* name, bool show, KeyValues* data);
 
 #pragma endregion
 

src/modules/cportal_player.cpp

@@ -14,6 +14,7 @@
 #include "utils.hpp"
 #include "commands.hpp"
 #include "globals.hpp"
+#include "signatures.hpp"
 
 // Redeclaration's for hooks.
 REDECL(CPortal_Player::PlayerDeathThink);
@@ -47,8 +48,8 @@ DETOUR_T(void, CPortal_Player::PlayerDeathThink)
 DEFINE_HOOK(CPortal_Player, FlashlightTurnOn);
 DETOUR_T(bool, CPortal_Player::FlashlightTurnOn, bool playSound)
 {
-	CBaseEntity* pEntity = static_cast<CBaseEntity*>(thisPtr);
-	const int playerIndex = Utils::EntityIndex(pEntity);
+	CBaseEntity* entity = static_cast<CBaseEntity*>(thisPtr);
+	const int playerIndex = Utils::EntityIndex(entity);
 	if (playerIndex <= 0 || playerIndex > MAX_PLAYERS)
 	{
 		Log(WARNING, false, "CPortal_Player::FlashlightTurnOn was called with a invalid player!");
@@ -59,7 +60,7 @@ DETOUR_T(bool, CPortal_Player::FlashlightTurnOn, bool playSound)
 
 	CPlayerFilter filter;
 	filter.AddPlayer(playerIndex);
-	CBaseEntity::EmitSound(pEntity, playerIndex, filter, "HL2Player.FlashLightOn", nullptr, 0.0f);
+	CBaseEntity::EmitSound(entity, playerIndex, filter, "HL2Player.FlashLightOn", nullptr, 0.0f);
 	return true;
 }
 
@@ -70,7 +71,7 @@ DETOUR_T(bool, CPortal_Player::FlashlightTurnOn, bool playSound)
 DEFINE_HOOK(CPortal_Player, FlashlightTurnOff);
 DETOUR_T(void, CPortal_Player::FlashlightTurnOff, bool playSound)
 {
-	CBaseEntity* pEntity = static_cast<CBaseEntity*>(thisPtr);
+	CBaseEntity* entity = static_cast<CBaseEntity*>(thisPtr);
 	const int playerIndex = Utils::EntityIndex(static_cast<CBaseEntity*>(thisPtr));
 	if (playerIndex <= 0 || playerIndex > MAX_PLAYERS)
 	{
@@ -82,7 +83,7 @@ DETOUR_T(void, CPortal_Player::FlashlightTurnOff, bool playSound)
 
 	CPlayerFilter filter;
 	filter.AddPlayer(playerIndex);
-	CBaseEntity::EmitSound(pEntity, playerIndex, filter, "HL2Player.FlashLightOff", nullptr, 0.0f);
+	CBaseEntity::EmitSound(entity, playerIndex, filter, "HL2Player.FlashLightOff", nullptr, 0.0f);
 }
 
 #pragma endregion
@@ -93,17 +94,18 @@ DETOUR_T(void, CPortal_Player::FlashlightTurnOff, bool playSound)
  * @brief Respawn a player where ever their spawn point is set.
  * @param playerEntityIndex Player entity index.
  */
+using RespawnPlayerT = void (__thiscall*)(CPortal_Player*);
 void CPortal_Player::RespawnPlayer(const int playerEntityIndex)
 {
-    const auto pPlayer = reinterpret_cast<CPortal_Player*>(Utils::PlayerByIndex(playerEntityIndex));
-    if (!pPlayer)
+    const auto player = reinterpret_cast<CPortal_Player*>(Utils::PlayerByIndex(playerEntityIndex));
+    if (!player)
     {
         Log(WARNING, false, "Couldn't get player to respawn! playerIndex: %i", playerEntityIndex);
         return;
     }
 
-    static auto respawnPlayer = reinterpret_cast<void(__thiscall*)(CPortal_Player*)>(Memory::Scan<void*>(MODULE_SERVER, "0F 57 C0 56 8B F1 57 8D 8E"));
-    respawnPlayer(pPlayer);
+    static auto respawnPlayer = Memory::Scan<RespawnPlayerT>(MODULE_SERVER, Signatures::RespawnPlayer);
+    respawnPlayer(player);
 }
 
 /**
@@ -114,19 +116,19 @@ void CPortal_Player::RespawnPlayer(const int playerEntityIndex)
  * @param playerEntityIndex Player entity index.
  * @param enabled Should flashlight be enabled or not.
  */
-void CPortal_Player::SetFlashlightState(int playerEntityIndex, bool enabled)
+void CPortal_Player::SetFlashlightState(const int playerEntityIndex, const bool enabled)
 {
-	CBasePlayer* pPlayer = Utils::PlayerByIndex(playerEntityIndex);
-	if (!pPlayer)
+	CBasePlayer* player = Utils::PlayerByIndex(playerEntityIndex);
+	if (!player)
 	{
 		Log(WARNING, true, "Couldn't get player to set flashlight state! playerIndex: %i enable: %i", playerEntityIndex, !!enabled);
 		return;
 	}
 
 	if (enabled)
-		CBaseEntity::AddEffects(reinterpret_cast<CBaseEntity*>(pPlayer), EF_DIMLIGHT);
+		CBaseEntity::AddEffects(reinterpret_cast<CBaseEntity*>(player), EF_DIMLIGHT);
 	else
-		CBaseEntity::RemoveEffects(reinterpret_cast<CBaseEntity*>(pPlayer), EF_DIMLIGHT);
+		CBaseEntity::RemoveEffects(reinterpret_cast<CBaseEntity*>(player), EF_DIMLIGHT);
 }
 
 #pragma	endregion

src/modules/misc.cpp

@@ -8,6 +8,7 @@
 #include "stdafx.hpp"
 #include "modules/misc.hpp"
 
+#include "math.hpp"
 #include "utils.hpp"
 
 // Redeclaration's for hooks.

src/signatures_portal2.hpp

@@ -1,18 +1,47 @@
 /*******************************************************************
-* @file   signatures.hpp
+* @file   signatures_portal2.hpp
 * @brief  Header to store all gather memory signatures or offsets used by the plugin.
 * @author SAR Team, Orsell, NULLderef
 * @date   06 2025
 *********************************************************************/
 
+#pragma once
+
+#ifndef SIGSP2_HPP
+#define SIGSP2_HPP
+
 #ifndef SIGSCAN
 #error "SIGSCAN macro must be defined!"
 #endif
 
+
+//------ CBaseEntity Signatures ------\\
+
+SIGSCAN(RemoveEntity, "55 8B EC 8B 45 08 85 C0 74 0C 83", "")
+SIGSCAN(GetScriptInstance, "55 8B EC 51 56 8B F1 83 BE 50", "")
+SIGSCAN(EmitSound, "55 8B EC 83 EC 4C 8B 0D", "")
+SIGSCAN(AddEffects, "55 8B EC 53 8B D9 8B 83 A8", "")
+SIGSCAN(RemoveEffects, "55 8B EC 53 56 8B 75 08 8B D9 8B 83", "")
+
+//------------------------------------\\
+
+//------ CBasePlayer Signatures ------\\
+
+SIGSCAN(ShowViewPortPanel, "55 8B EC 83 EC 20 53 56 8B F1 57 8D 4D ? E8 ? ? ? ? 56", "")
+
+//------------------------------------\\
+
+//------ CPortal_Player Signatures ------\\
+
+SIGSCAN(RespawnPlayer, "0F 57 C0 56 8B F1 57 8D 8E", "")
+
 // CPortal_Player::NotifySystemEvent | "movzx  eax, byte ptr [edi+504h]" -> "jmp  short loc_103552D0"
 SIGSCAN(CPortal_Player_NotifySystemEvent_EventTeleportUserID, "0F B6 87 04 05 00 00 8B 16", "")
 SIGSCAN(CPortal_Player_NotifySystemEvent_EventTeleportUserID_Patch, "EB 14 87 04 05 00 00 8B 16", "")
 
+
+//---------------------------------------\\
+
 // Squirrel VM runtime timeout, increase runtime max from 0.03 to 0.05.
 SIGSCAN(SQVM_RuntimeTimeout, "00 00 00 E0 51 B8 9E 3F", "")
 SIGSCAN(SQVM_RuntimeTimeout_Patch, "9A 99 99 99 99 99 A9 3F", "")
@@ -21,7 +50,7 @@ SIGSCAN(SQVM_RuntimeTimeout_Patch, "9A 99 99 99 99 99 A9 3F", "")
 SIGSCAN(CEnvProjectedTexture_EnforceSingleProjectionRules_Loop, "8B F0 3B F3 0F 84 95 00 00 00", "")
 SIGSCAN(CEnvProjectedTexture_EnforceSingleProjectionRules_Loop_Patch, "E9 9D 00 00 00 84 95 00 00 00", "")
 
-// CClientShadowMgr::CalculateRenderTargetsAndSizes | Increase the projected texture limit from 1 -> 8 
+// CClientShadowMgr::CalculateRenderTargetsAndSizes | Increase the projected texture limit from 1 -> 8
 SIGSCAN(CClientShadowMgr_CalculateRenderTargetsAndSizes_PtexLimit, "F7 D8 1B C0 83 E0 07 40 5F", "")
 SIGSCAN(CClientShadowMgr_CalculateRenderTargetsAndSizes_PtexLimit_Patch, "B8 08 00 00 00 90 90 90 5F", "")
 
@@ -32,3 +61,5 @@ SIGSCAN(CClientShadowMgr_CalculateRenderTargetsAndSizes_ShadowRes_Patch, "0F 94
 // CShadowMgr::DrawVolumetrics | Enable volumetrics for all env_projectedtextures.
 SIGSCAN(CShadowMgr_DrawVolumetrics_VolState, "0F 85 47 0C 00 00 80 BF 10 02 00 00 00 0F 84 3A 0C 00 00", "")
 SIGSCAN(CShadowMgr_DrawVolumetrics_VolState_Patch, "0F 84 47 0C 00 00 80 BF 10 02 00 00 00 0F 85 3A 0C 00 00", "")
+
+#endif