@@ -468,16 +468,26 @@ void PlayerMixin::SetShotsFired(unsigned char value)
 }
 
 
-short PlayerMixin::GetArmor()
+int PlayerMixin::GetArmor()
 {
+#if defined(ENGINE_BRANCH_HL2DM)
+	static int offset = FindDatamapPropertyOffset("m_ArmorValue");
+	return GetDatamapPropertyByOffset<int>(offset);
+#else
 	static int offset = FindNetworkPropertyOffset("m_ArmorValue");
 	return GetNetworkPropertyByOffset<char>(offset);
+#endif
 }
 
-void PlayerMixin::SetArmor(short value)
+void PlayerMixin::SetArmor(int value)
 {
+#if defined(ENGINE_BRANCH_HL2DM)
+	static int offset = FindDatamapPropertyOffset("m_ArmorValue");
+	SetDatamapPropertyByOffset<int>(offset, value);
+#else
 	static int offset = FindNetworkPropertyOffset("m_ArmorValue");
 	SetNetworkPropertyByOffset<char>(offset, value);
+#endif
 }
 
 
 
@@ -168,9 +168,8 @@ class PlayerMixin: public CBaseEntityWrapper
 	unsigned char GetShotsFired();
 	void SetShotsFired(unsigned char value);
 
-	// It's char actually, but Boost.Python converts a char to a Python string
-	short GetArmor();
-	void SetArmor(short value);
+	int GetArmor();
+	void SetArmor(int value);
 
 	bool GetHasDefuser();
 	void SetHasDefuser(bool value);
Original file line number	Diff line number	Diff line change
@@ -468,16 +468,26 @@ void PlayerMixin::SetShotsFired(unsigned char value)
468	468	}
469	469
470	470
471		- short PlayerMixin::GetArmor()
	471	+ int PlayerMixin::GetArmor()
472	472	{
	473	+ #if defined(ENGINE_BRANCH_HL2DM)
	474	+ static int offset = FindDatamapPropertyOffset("m_ArmorValue");
	475	+ return GetDatamapPropertyByOffset<int>(offset);
	476	+ #else
473	477	static int offset = FindNetworkPropertyOffset("m_ArmorValue");
474	478	return GetNetworkPropertyByOffset<char>(offset);
	479	+ #endif
475	480	}
476	481
477		- void PlayerMixin::SetArmor(short value)
	482	+ void PlayerMixin::SetArmor(int value)
478	483	{
	484	+ #if defined(ENGINE_BRANCH_HL2DM)
	485	+ static int offset = FindDatamapPropertyOffset("m_ArmorValue");
	486	+ SetDatamapPropertyByOffset<int>(offset, value);
	487	+ #else
479	488	static int offset = FindNetworkPropertyOffset("m_ArmorValue");
480	489	SetNetworkPropertyByOffset<char>(offset, value);
	490	+ #endif
481	491	}
482	492
483	493