From 6c22cb171d28d2fb78ce07ac836ad48ce5c7e1bd Mon Sep 17 00:00:00 2001
From: Scott Ehlert <ds@alliedmods.net>
Date: Mon, 4 Feb 2013 18:40:04 -0600
Subject: [PATCH] Synced hamdata.ini.

---
 configs/hamdata.ini                 | 400 ++++++++++++++--------------
 dlls/hamsandwich/config/hamdata.ini |  47 +++-
 2 files changed, 239 insertions(+), 208 deletions(-)

diff --git a/configs/hamdata.ini b/configs/hamdata.ini
index 96b98e4b..848f7f7d 100644
--- a/configs/hamdata.ini
+++ b/configs/hamdata.ini
@@ -45,112 +45,112 @@
 
 ; TODO: check these - all are estimates
 @section cstrike linux
-	pev 0
-	base 0x94
+	pev 4
+	base 0x0
 	
-	spawn 2
-	precache 3
-	keyvalue 5
-	objectcaps 8
-	activate 9
-	setobjectcollisionbox 10
-	classify 11
-	deathnotice 12
-	traceattack 13
-	takedamage 14
-	takehealth 15
-	killed 16
-	bloodcolor 17
-	tracebleed 18
-	istriggered 19
-	mymonsterpointer 20
-	mysquadmonsterpointer 21
-	gettogglestate 22
-	addpoints 23
-	addpointstoteam 24
-	addplayeritem 25
-	removeplayeritem 26
-	giveammo 27
-	getdelay 28
-	ismoving 29
-	overridereset 30
-	damagedecal 31
-	settogglestate 32
-	startsneaking 33
-	stopsneaking 34
-	oncontrols 35
-	issneaking 36
-	isalive 37
-	isbspmodel 38
-	reflectgauss 39
-	hastarget 40
-	isinworld 41
-	isplayer 42
-	isnetclient 43
-	teamid 44
-	getnexttarget 45
-	think 46
-	touch 47
-	use 48
-	blocked 49
-	respawn 50
-	updateowner 51
-	fbecomeprone 52
-	center 53
-	eyeposition 54
-	earposition 55
-	bodytarget 56
-	illumination 57
-	fvisible 58
-	fvecvisible 59
+	spawn 0
+	precache 1
+	keyvalue 3
+	objectcaps 6
+	activate 7
+	setobjectcollisionbox 8
+	classify 9
+	deathnotice 10
+	traceattack 11
+	takedamage 12
+	takehealth 13
+	killed 14
+	bloodcolor 15
+	tracebleed 16
+	istriggered 17
+	mymonsterpointer 18
+	mysquadmonsterpointer 19
+	gettogglestate 20
+	addpoints 21
+	addpointstoteam 22
+	addplayeritem 23
+	removeplayeritem 24
+	giveammo 25
+	getdelay 26
+	ismoving 27
+	overridereset 28
+	damagedecal 29
+	settogglestate 30
+	startsneaking 31
+	stopsneaking 32
+	oncontrols 33
+	issneaking 34
+	isalive 35
+	isbspmodel 36
+	reflectgauss 37
+	hastarget 38
+	isinworld 39
+	isplayer 40
+	isnetclient 41
+	teamid 42
+	getnexttarget 43
+	think 44
+	touch 45
+	use 46
+	blocked 47
+	respawn 48
+	updateowner 49
+	fbecomeprone 50
+	center 51
+	eyeposition 52
+	earposition 53
+	bodytarget 54
+	illumination 55
+	fvisible 56
+	fvecvisible 57
 	
-	player_jump 78
-	player_duck 79
-	player_prethink 80
-	player_postthink 81
-	player_getgunposition 82
-	player_shouldfadeondeath 68
-	player_impulsecommands 84
-	player_updateclientdata 83
+	player_jump 76
+	player_duck 77
+	player_prethink 78
+	player_postthink 79
+	player_getgunposition 80
+	player_shouldfadeondeath 66
+	player_impulsecommands 83
+	player_updateclientdata 82
 	
-	item_addtoplayer 61
-	item_addduplicate 62
-	item_getiteminfo 63
-	item_candeploy 64
-	item_deploy 66
-	item_canholster 68
-	item_holster 69
-	item_updateiteminfo 70
-	item_preframe 71
-	item_postframe 72
-	item_drop 73
-	item_kill 74
-	item_attachtoplayer 75
-	item_primaryammoindex 76
-	item_secondaryammoindex 77
-	item_updateclientdata 78
-	item_getweaponptr 79
-	item_itemslot 81
+	item_addtoplayer 59
+	item_addduplicate 60
+	item_getiteminfo 61
+	item_candeploy 62
+	item_deploy 64
+	item_canholster 66
+	item_holster 67
+	item_updateiteminfo 68
+	item_preframe 69
+	item_postframe 70
+	item_drop 71
+	item_kill 72
+	item_attachtoplayer 73
+	item_primaryammoindex 74
+	item_secondaryammoindex 75
+	item_updateclientdata 76
+	item_getweaponptr 77
+	item_itemslot 79
 	
-	weapon_extractammo 82
-	weapon_extractclipammo 83
-	weapon_addweapon 84
-	weapon_playemptysound 85
-	weapon_resetemptysound 86
-	weapon_sendweaponanim 87
-	weapon_isusable 88
-	weapon_primaryattack 89
-	weapon_secondaryattack 90
-	weapon_reload 91
-	weapon_weaponidle 92
-	weapon_retireweapon 93
-	weapon_shouldweaponidle 94
-	weapon_usedecrement 95
+	weapon_extractammo 80
+	weapon_extractclipammo 81
+	weapon_addweapon 82
+	weapon_playemptysound 83
+	weapon_resetemptysound 84
+	weapon_sendweaponanim 85
+	weapon_isusable 86
+	weapon_primaryattack 87
+	weapon_secondaryattack 88
+	weapon_reload 89
+	weapon_weaponidle 90
+	weapon_retireweapon 91
+	weapon_shouldweaponidle 92
+	weapon_usedecrement 93
 	
-	cstrike_restart 4
-	cstrike_roundrespawn 86
-	cstrike_item_candrop 65
-	cstrike_item_getmaxspeed 80
+	cstrike_restart 2
+	cstrike_roundrespawn 84
+	cstrike_item_candrop 63
+	cstrike_item_getmaxspeed 78
 	
 @end
 @section cstrike windows
@@ -219,8 +219,8 @@
 	player_postthink 79
 	player_getgunposition 80
 	player_shouldfadeondeath 66
-	player_impulsecommands 82
-	player_updateclientdata 81
+	player_impulsecommands 83
+	player_updateclientdata 82
 	
 	item_addtoplayer 59
 	item_addduplicate 60
@@ -1543,107 +1543,107 @@
 	
 @end
 @section valve linux
-	pev 0
-	base 0x60
+	pev 4
+	base 0x0
 	
-	spawn 2
-	precache 3
-	keyvalue 4
-	objectcaps 7
-	activate 8
-	setobjectcollisionbox 9
-	classify 10
-	deathnotice 11
-	traceattack 12
-	takedamage 13
-	takehealth 14
-	killed 15
-	bloodcolor 16
-	tracebleed 17
-	istriggered 18
-	mymonsterpointer 19
-	mysquadmonsterpointer 20
-	gettogglestate 21
-	addpoints 22
-	addpointstoteam 23
-	addplayeritem 24
-	removeplayeritem 25
-	giveammo 26
-	getdelay 27
-	ismoving 28
-	overridereset 29
-	damagedecal 30
-	settogglestate 31
-	startsneaking 32
-	stopsneaking 33
-	oncontrols 34
-	issneaking 35
-	isalive 36
-	isbspmodel 37
-	reflectgauss 38
-	hastarget 39
-	isinworld 40
-	isplayer 41
-	isnetclient 42
-	teamid 43
-	getnexttarget 44
-	think 45
-	touch 46
-	use 47
-	blocked 48
-	respawn 49
-	updateowner 50
-	fbecomeprone 51
-	center 52
-	eyeposition 53
-	earposition 54
-	bodytarget 55
-	illumination 56
-	fvisible 57
-	fvecvisible 58
+	spawn 0
+	precache 1
+	keyvalue 2
+	objectcaps 5
+	activate 6
+	setobjectcollisionbox 7
+	classify 8
+	deathnotice 9
+	traceattack 10
+	takedamage 11
+	takehealth 12
+	killed 13
+	bloodcolor 14
+	tracebleed 15
+	istriggered 16
+	mymonsterpointer 17
+	mysquadmonsterpointer 18
+	gettogglestate 19
+	addpoints 20
+	addpointstoteam 21
+	addplayeritem 22
+	removeplayeritem 23
+	giveammo 24
+	getdelay 25
+	ismoving 26
+	overridereset 27
+	damagedecal 28
+	settogglestate 29
+	startsneaking 30
+	stopsneaking 31
+	oncontrols 32
+	issneaking 33
+	isalive 34
+	isbspmodel 35
+	reflectgauss 36
+	hastarget 37
+	isinworld 38
+	isplayer 39
+	isnetclient 40
+	teamid 41
+	getnexttarget 42
+	think 43
+	touch 44
+	use 45
+	blocked 46
+	respawn 47
+	updateowner 48
+	fbecomeprone 49
+	center 50
+	eyeposition 51
+	earposition 52
+	bodytarget 53
+	illumination 54
+	fvisible 55
+	fvecvisible 56
 	
-	player_jump 127
-	player_duck 128
-	player_prethink 129
-	player_postthink 130
-	player_getgunposition 121
-	player_shouldfadeondeath 62
-	player_impulsecommands 132
-	player_updateclientdata  131
+	player_jump 125
+	player_duck 126
+	player_prethink 127
+	player_postthink 128
+	player_getgunposition 119
+	player_shouldfadeondeath 60
+	player_impulsecommands 130
+	player_updateclientdata  129
 	
-	item_addtoplayer 60
-	item_addduplicate 61
-	item_getiteminfo 62
-	item_candeploy 63
-	item_deploy 64
-	item_canholster 65
-	item_holster 66
-	item_updateiteminfo 67
-	item_preframe 68
-	item_postframe 69
-	item_drop 70
-	item_kill 71
-	item_attachtoplayer 72
-	item_primaryammoindex 73
-	item_secondaryammoindex 74
-	item_updateclientdata 75
-	item_getweaponptr 76
-	item_itemslot 77
+	item_addtoplayer 58
+	item_addduplicate 59
+	item_getiteminfo 60
+	item_candeploy 61
+	item_deploy 62
+	item_canholster 63
+	item_holster 64
+	item_updateiteminfo 65
+	item_preframe 66
+	item_postframe 67
+	item_drop 68
+	item_kill 69
+	item_attachtoplayer 70
+	item_primaryammoindex 71
+	item_secondaryammoindex 72
+	item_updateclientdata 73
+	item_getweaponptr 74
+	item_itemslot 75
 	
-	weapon_extractammo 78
-	weapon_extractclipammo 79
-	weapon_addweapon 80
-	weapon_playemptysound 81
-	weapon_resetemptysound 82
-	weapon_sendweaponanim 83
-	weapon_isusable 84
-	weapon_primaryattack 85
-	weapon_secondaryattack 86
-	weapon_reload 87
-	weapon_weaponidle 88
-	weapon_retireweapon 89
-	weapon_shouldweaponidle 90
-	weapon_usedecrement 91
+	weapon_extractammo 76
+	weapon_extractclipammo 77
+	weapon_addweapon 78
+	weapon_playemptysound 79
+	weapon_resetemptysound 80
+	weapon_sendweaponanim 81
+	weapon_isusable 82
+	weapon_primaryattack 83
+	weapon_secondaryattack 84
+	weapon_reload 85
+	weapon_weaponidle 86
+	weapon_retireweapon 87
+	weapon_shouldweaponidle 88
+	weapon_usedecrement 89
 @end
 @section valve windows
 	pev 4
diff --git a/dlls/hamsandwich/config/hamdata.ini b/dlls/hamsandwich/config/hamdata.ini
index 03ac863a..587f3dd8 100644
--- a/dlls/hamsandwich/config/hamdata.ini
+++ b/dlls/hamsandwich/config/hamdata.ini
@@ -1147,14 +1147,6 @@
 	ts_weapon_alternateattack 95
 @end
 
-; Sven-Coop has no linux binaries.  This makes disassembly much harder.
-@section svencoop windows
-	pev 4
-	base 0x0
-	
-	takedamage 11
-	use 46
-@end
 
 @section esf windows
 	pev 4
@@ -1757,3 +1749,42 @@
 	weapon_usedecrement 89
 	
 @end
+; Sven-Coop has no linux binaries.  This makes disassembly much harder.
+; These offsets were contributed by ts2do
+@section SvenCoop windows
+	pev 4
+	base 0x0
+	
+	spawn 0
+	precache 1
+	keyvalue 2
+	objectcaps 5
+	takedamage 11
+	addpoints 20
+	addpointstoteam 21
+	addplayeritem 22
+	removeplayeritem 23
+	giveammo 24
+	oncontrols 32
+	isalive 34
+	isbspmodel 35
+	reflectgauss 36
+	hastarget 37
+	isinworld 38
+	isplayer 39
+	isnetclient 40
+	teamid 42
+	getnexttarget 43
+	think 44
+	touch 45
+	use 46
+	blocked 47
+	respawn 48
+	center 51
+	eyeposition 52
+	earposition 53
+	bodytarget 54
+	illumination 55
+	fvisible 56
+
+@end