diff --git a/dlls/cstrike/cstrike.h b/dlls/cstrike/cstrike.h
index 832a317f..cb063fe2 100755
--- a/dlls/cstrike/cstrike.h
+++ b/dlls/cstrike/cstrike.h
@@ -51,38 +51,73 @@
 #endif // defined __linux__
 
 // "player" entities
-#define OFFSET_TEAM					114 + EXTRAOFFSET
-#define OFFSET_CSMONEY				115 + EXTRAOFFSET
-#define OFFSET_PRIMARYWEAPON		116 + EXTRAOFFSET
-#define OFFSET_INTERNALMODEL		126 + EXTRAOFFSET
-#define OFFSET_NVGOGGLES			129 + EXTRAOFFSET
-#define OFFSET_DEFUSE_PLANT			193 + EXTRAOFFSET
-#define OFFSET_VIP					215 + EXTRAOFFSET
-#define OFFSET_BUYZONE				241 + EXTRAOFFSET
+#if !defined __amd64__
+	#define OFFSET_TEAM					114 + EXTRAOFFSET
+	#define OFFSET_CSMONEY				115 + EXTRAOFFSET
+	#define OFFSET_PRIMARYWEAPON		116 + EXTRAOFFSET
+	#define OFFSET_INTERNALMODEL		126 + EXTRAOFFSET
+	#define OFFSET_NVGOGGLES			129 + EXTRAOFFSET
+	#define OFFSET_DEFUSE_PLANT			193 + EXTRAOFFSET
+	#define OFFSET_VIP					215 + EXTRAOFFSET
+	#define OFFSET_BUYZONE				241 + EXTRAOFFSET
 
-#define OFFSET_AWM_AMMO				382 + EXTRAOFFSET
-#define OFFSET_SCOUT_AMMO			383 + EXTRAOFFSET
-#define OFFSET_PARA_AMMO			384 + EXTRAOFFSET
-#define OFFSET_FAMAS_AMMO			385 + EXTRAOFFSET
-#define OFFSET_M3_AMMO				386 + EXTRAOFFSET
-#define OFFSET_USP_AMMO				387 + EXTRAOFFSET
-#define OFFSET_FIVESEVEN_AMMO		388 + EXTRAOFFSET
-#define OFFSET_DEAGLE_AMMO			389 + EXTRAOFFSET
-#define OFFSET_P228_AMMO			390 + EXTRAOFFSET
-#define OFFSET_GLOCK_AMMO			391 + EXTRAOFFSET
-#define OFFSET_FLASH_AMMO			392 + EXTRAOFFSET
-#define OFFSET_HE_AMMO				393 + EXTRAOFFSET
-#define OFFSET_SMOKE_AMMO			394 + EXTRAOFFSET
-#define OFFSET_C4_AMMO				395	+ EXTRAOFFSET
+	#define OFFSET_AWM_AMMO				382 + EXTRAOFFSET
+	#define OFFSET_SCOUT_AMMO			383 + EXTRAOFFSET
+	#define OFFSET_PARA_AMMO			384 + EXTRAOFFSET
+	#define OFFSET_FAMAS_AMMO			385 + EXTRAOFFSET
+	#define OFFSET_M3_AMMO				386 + EXTRAOFFSET
+	#define OFFSET_USP_AMMO				387 + EXTRAOFFSET
+	#define OFFSET_FIVESEVEN_AMMO		388 + EXTRAOFFSET
+	#define OFFSET_DEAGLE_AMMO			389 + EXTRAOFFSET
+	#define OFFSET_P228_AMMO			390 + EXTRAOFFSET
+	#define OFFSET_GLOCK_AMMO			391 + EXTRAOFFSET
+	#define OFFSET_FLASH_AMMO			392 + EXTRAOFFSET
+	#define OFFSET_HE_AMMO				393 + EXTRAOFFSET
+	#define OFFSET_SMOKE_AMMO			394 + EXTRAOFFSET
+	#define OFFSET_C4_AMMO				395	+ EXTRAOFFSET
 
-#define OFFSET_CSDEATHS				449 + EXTRAOFFSET
-// "weapon_*" entities
-#define OFFSET_WEAPONTYPE			43 + EXTRAOFFSET
-#define OFFSET_CLIPAMMO				51 + EXTRAOFFSET
-#define OFFSET_SILENCER_FIREMODE	74 + EXTRAOFFSET
-// "hostage_entity" entities
-#define OFFSET_HOSTAGEFOLLOW		86 + EXTRAOFFSET
-#define OFFSET_HOSTAGEID			487 + EXTRAOFFSET
+	#define OFFSET_CSDEATHS				449 + EXTRAOFFSET
+	// "weapon_*" entities
+	#define OFFSET_WEAPONTYPE			43 + EXTRAOFFSET
+	#define OFFSET_CLIPAMMO				51 + EXTRAOFFSET
+	#define OFFSET_SILENCER_FIREMODE	74 + EXTRAOFFSET
+	// "hostage_entity" entities
+	#define OFFSET_HOSTAGEFOLLOW		86 + EXTRAOFFSET
+	#define OFFSET_HOSTAGEID			487 + EXTRAOFFSET
+#else
+	#define OFFSET_TEAM					139 + EXTRAOFFSET // +25
+	#define OFFSET_CSMONEY				140 + EXTRAOFFSET // +25
+	#define OFFSET_PRIMARYWEAPON		141 + EXTRAOFFSET // +25
+	#define OFFSET_INTERNALMODEL		152 + EXTRAOFFSET // +26
+	#define OFFSET_NVGOGGLES			155 + EXTRAOFFSET // +26
+	#define OFFSET_DEFUSE_PLANT			219 + EXTRAOFFSET // +26
+	#define OFFSET_VIP					242 + EXTRAOFFSET // +27
+	#define OFFSET_BUYZONE				268 + EXTRAOFFSET // +27
+
+	#define OFFSET_AWM_AMMO				426 + EXTRAOFFSET // +44
+	#define OFFSET_SCOUT_AMMO			427 + EXTRAOFFSET // +44
+	#define OFFSET_PARA_AMMO			428 + EXTRAOFFSET // +44
+	#define OFFSET_FAMAS_AMMO			429 + EXTRAOFFSET // +44
+	#define OFFSET_M3_AMMO				430 + EXTRAOFFSET // +44
+	#define OFFSET_USP_AMMO				431 + EXTRAOFFSET // +44
+	#define OFFSET_FIVESEVEN_AMMO		432 + EXTRAOFFSET // +44
+	#define OFFSET_DEAGLE_AMMO			433 + EXTRAOFFSET // +44
+	#define OFFSET_P228_AMMO			434 + EXTRAOFFSET // +44
+	#define OFFSET_GLOCK_AMMO			435 + EXTRAOFFSET // +44
+	#define OFFSET_FLASH_AMMO			436 + EXTRAOFFSET // +44
+	#define OFFSET_HE_AMMO				437 + EXTRAOFFSET // +44
+	#define OFFSET_SMOKE_AMMO			438 + EXTRAOFFSET // +44
+	#define OFFSET_C4_AMMO				439	+ EXTRAOFFSET // +44
+
+	#define OFFSET_CSDEATHS				493 + EXTRAOFFSET // +44
+	// "weapon_*" entities
+	#define OFFSET_WEAPONTYPE			57 + EXTRAOFFSET // +14
+	#define OFFSET_CLIPAMMO				65 + EXTRAOFFSET // +14
+	#define OFFSET_SILENCER_FIREMODE	88 + EXTRAOFFSET // +14
+	// "hostage_entity" entities
+	#define OFFSET_HOSTAGEFOLLOW		107 + EXTRAOFFSET // +21
+	#define OFFSET_HOSTAGEID			516 + EXTRAOFFSET // +29
+#endif
 
 // Ids of weapons in CS
 #define CSW_P228						1