Merge remote-tracking branch 'origin/master'

1 files changed, 15 insertions, 1 deletions

diff --git a/cheat/internal_rewrite/c_base_player.hpp b/cheat/internal_rewrite/c_base_player.hpp
index 690f55c..7eeb9d3 100644
--- a/cheat/internal_rewrite/c_base_player.hpp
+++ b/cheat/internal_rewrite/c_base_player.hpp
@@ -263,7 +263,7 @@ public:
 	NETVAR( m_vecOrigin, "m_vecOrigin", "DT_BaseEntity", 0, vec3_t );
 	NETVAR( m_vecViewOffset, "m_vecViewOffset[0]", "DT_BasePlayer", 0, vec3_t );
 	NETVAR( m_hActiveWeapon, "m_hActiveWeapon", "DT_BaseCombatCharacter", 0, ulong_t );
-	NETVAR( m_iTeamNum, "m_iTeamNum", "DT_BaseEntity", 0, int );
+	
 	NETVAR( m_bHasHelmet, "m_bHasHelmet", "DT_CSPlayer", 0, bool );
 	NETVAR( m_bHasDefuser, "m_bHasDefuser", "DT_CSPlayer", 0, bool );
 	NETVAR( m_ArmorValue, "m_ArmorValue", "DT_CSPlayer", 0, int );
@@ -347,6 +347,20 @@ public:
 		return util::get_vfunc< 187, void >( this, curtime );
 	}
 
+	__forceinline int& m_iTeamNum( ) {
+		static auto team_num = g_netvars.get_netvar( fnv( "DT_BaseEntity" ), fnv( "m_iTeamNum" ) );
+		static auto survival_team = g_netvars.get_netvar( fnv( "DT_CSPlayer" ), fnv( "m_nSurvivalTeam" ) );
+
+		//char name[ 32 ];
+		//get_name_safe( name );
+
+		//printf( "%s: %d (%08x)\n", name, get< int >( survival_team ), survival_team );
+		if( get< int >( survival_team ) != -1 )
+			return get< int >( survival_team );
+
+		return get< int >( team_num );
+	}
+
 	__forceinline void standard_blending_rules( void* hdr, vec3_t* pos, void* q, float curtime, int bone_mask ) {
 		return util::get_vfunc< 200, void >( this, hdr, pos, q, curtime, bone_mask );
 	}