From 9b0ed67c9c6859e546a42578fecaee60aecebdda Mon Sep 17 00:00:00 2001
From: Steve Dudenhoeffer <stevedude@gmail.com>
Date: Fri, 11 May 2007 16:54:26 +0000
Subject: [PATCH] Fixed vtable for TFC and NS

---
 dlls/hamsandwich/config/hamdata.ini      | 323 ++++++++++++-----------
 dlls/hamsandwich/include/hamsandwich.inc |   2 +-
 2 files changed, 163 insertions(+), 162 deletions(-)

diff --git a/dlls/hamsandwich/config/hamdata.ini b/dlls/hamsandwich/config/hamdata.ini
index d06c5cf6..3309e0e9 100644
--- a/dlls/hamsandwich/config/hamdata.ini
+++ b/dlls/hamsandwich/config/hamdata.ini
@@ -550,38 +550,38 @@
 	player_shouldfadeondeath 69
 	player_impulsecommands 139
 	
-	item_addtoplayer 58
-	item_addduplicate 59
-	item_getiteminfo 61
-	item_candeploy 62
-	item_deploy 63
-	item_canholster 64
-	item_holster 65
-	item_updateiteminfo 66
-	item_preframe 67
-	item_postframe 68
-	item_drop 69
-	item_kill 70
-	item_attachtoplayer 71
-	item_primaryammoindex 72
-	item_secondaryammoindex 73
-	item_updateclientdata 74
-	item_getweaponptr 75
-	item_itemslot 60
+	item_addtoplayer 67
+	item_addduplicate 68
+	item_getiteminfo 70
+	item_candeploy 71
+	item_deploy 72
+	item_canholster 73
+	item_holster 74
+	item_updateiteminfo 75
+	item_preframe 76
+	item_postframe 77
+	item_drop 78
+	item_kill 79
+	item_attachtoplayer 80
+	item_primaryammoindex 81
+	item_secondaryammoindex 82
+	item_updateclientdata 83
+	item_getweaponptr 84
+	item_itemslot 69
 	
-	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_extractammo 85
+	weapon_extractclipammo 86
+	weapon_addweapon 87
+	weapon_playemptysound 88
+	weapon_resetemptysound 89
+	weapon_sendweaponanim 90
+	weapon_isusable 91
+	weapon_primaryattack 92
+	weapon_secondaryattack 93
+	weapon_reload 94
+	weapon_weaponidle 95
+	weapon_retireweapon 96
+	weapon_shouldweaponidle 97
 
 	tfc_engineeruse 58
 	tfc_finished 59
@@ -649,6 +649,7 @@
 	fvisible 54
 	fvecvisible 55
 	
+	
 	player_jump 133
 	player_duck 134
 	player_prethink 135
@@ -656,38 +657,38 @@
 	player_shouldfadeondeath 67
 	player_impulsecommands 137
 	
-	item_addtoplayer 56
-	item_addduplicate 57
-	item_getiteminfo 59
-	item_candeploy 60
-	item_deploy 61
-	item_canholster 62
-	item_holster 63
-	item_updateiteminfo 64
-	item_preframe 65
-	item_postframe 66
-	item_drop 67
-	item_kill 68
-	item_attachtoplayer 69
-	item_primaryammoindex 70
-	item_secondaryammoindex 71
-	item_updateclientdata 72
-	item_getweaponptr 73
-	item_itemslot 58
+	item_addtoplayer 65
+	item_addduplicate 66
+	item_getiteminfo 68
+	item_candeploy 69
+	item_deploy 70
+	item_canholster 71
+	item_holster 72
+	item_updateiteminfo 73
+	item_preframe 74
+	item_postframe 75
+	item_drop 76
+	item_kill 77
+	item_attachtoplayer 78
+	item_primaryammoindex 79
+	item_secondaryammoindex 80
+	item_updateclientdata 81
+	item_getweaponptr 82
+	item_itemslot 67
 	
-	weapon_extractammo 74
-	weapon_extractclipammo 75
-	weapon_addweapon 76
-	weapon_playemptysound 77
-	weapon_resetemptysound 78
-	weapon_sendweaponanim 79
-	weapon_isusable 80
-	weapon_primaryattack 81
-	weapon_secondaryattack 82
-	weapon_reload 83
-	weapon_weaponidle 84
-	weapon_retireweapon 85
-	weapon_shouldweaponidle 86
+	weapon_extractammo 83
+	weapon_extractclipammo 84
+	weapon_addweapon 85
+	weapon_playemptysound 86
+	weapon_resetemptysound 87
+	weapon_sendweaponanim 88
+	weapon_isusable 89
+	weapon_primaryattack 90
+	weapon_secondaryattack 91
+	weapon_reload 92
+	weapon_weaponidle 93
+	weapon_retireweapon 94
+	weapon_shouldweaponidle 95
 
 	tfc_engineeruse 56
 	tfc_finished 57
@@ -703,109 +704,109 @@
 	pev 4
 	base 0x0
 	
-	spawn 1
-	precache 2
-	keyvalue 3
-	objectcaps 6
-	activate 7
-	setobjectcollisionbox 8
-	classify 9
-	deathnotice 10
-	traceattack 11
-	takedamage 12
-	takehealth 13
-	killed 15
-	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 47
-	think 48
-	touch 49
-	use 50
-	blocked 51
-	respawn 53
-	updateowner 54
-	fbecomeprone 55
-	center 56
-	eyeposition 57
-	earposition 58
-	bodytarget 59
-	illumination 60
-	fvisible 61
-	fvecvisible 62
+	spawn 0
+	precache 1
+	keyvalue 2
+	objectcaps 5
+	activate 6
+	setobjectcollisionbox 7
+	classify 8
+	deathnotice 9
+	traceattack 10
+	takedamage 11
+	takehealth 12
+	killed 14
+	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 46
+	think 47
+	touch 48
+	use 49
+	blocked 50
+	respawn 52
+	updateowner 53
+	fbecomeprone 54
+	center 55
+	eyeposition 56
+	earposition 57
+	bodytarget 58
+	illumination 59
+	fvisible 60
+	fvecvisible 61
 	
-	player_jump 84
-	player_duck 85
-	player_prethink 86
-	player_postthink 87
-	player_getgunposition 88
-	player_shouldfadeondeath 73
-	player_impulsecommands 102
-	player_updateclientdata 100
+	player_jump 83
+	player_duck 84
+	player_prethink 85
+	player_postthink 86
+	player_getgunposition 87
+	player_shouldfadeondeath 72
+	player_impulsecommands 101
+	player_updateclientdata 99
 	
-	item_addtoplayer 65
-	item_addduplicate 66
-	item_getiteminfo 69
-	item_candeploy 70
-	item_deploy 71
-	item_canholster 72
-	item_holster 73
-	item_updateiteminfo 75
-	item_preframe 76
-	item_postframe 77
-	item_drop 78
-	item_kill 79
-	item_attachtoplayer 80
-	item_primaryammoindex 81
-	item_secondaryammoindex 82
-	item_updateclientdata 83
-	item_getweaponptr 84
-	item_itemslot 85
+	item_addtoplayer 64
+	item_addduplicate 65
+	item_getiteminfo 68
+	item_candeploy 69
+	item_deploy 70
+	item_canholster 71
+	item_holster 72
+	item_updateiteminfo 74
+	item_preframe 75
+	item_postframe 76
+	item_drop 77
+	item_kill 78
+	item_attachtoplayer 79
+	item_primaryammoindex 80
+	item_secondaryammoindex 81
+	item_updateclientdata 82
+	item_getweaponptr 83
+	item_itemslot 84
 	
-	weapon_extractammo 86
-	weapon_extractclipammo 87
-	weapon_addweapon 88
-	weapon_playemptysound 89
-	weapon_resetemptysound 90
-	weapon_sendweaponanim 95
-	weapon_isusable 74
-	weapon_primaryattack 99
-	weapon_secondaryattack 100
-	weapon_reload 101
-	weapon_weaponidle 102
-	weapon_retireweapon 103
-	weapon_shouldweaponidle 104
-	weapon_usedecrement 105
+	weapon_extractammo 85
+	weapon_extractclipammo 86
+	weapon_addweapon 87
+	weapon_playemptysound 88
+	weapon_resetemptysound 89
+	weapon_sendweaponanim 94
+	weapon_isusable 73
+	weapon_primaryattack 98
+	weapon_secondaryattack 99
+	weapon_reload 100
+	weapon_weaponidle 101
+	weapon_retireweapon 102
+	weapon_shouldweaponidle 103
+	weapon_usedecrement 104
 	
-	ns_getpointvalue 14
-	ns_awardkill 16
-	ns_resetentity 46
-	ns_updateonremove 52
+	ns_getpointvalue 13
+	ns_awardkill 15
+	ns_resetentity 45
+	ns_updateonremove 51
 @end
 @section ns windows
 	pev 4
diff --git a/dlls/hamsandwich/include/hamsandwich.inc b/dlls/hamsandwich/include/hamsandwich.inc
index 230df400..4fb511c5 100644
--- a/dlls/hamsandwich/include/hamsandwich.inc
+++ b/dlls/hamsandwich/include/hamsandwich.inc
@@ -666,7 +666,7 @@ public __fatal_ham_error(Ham:id, HamError:err, const reason[])
 	new func=get_func_id("HamFilter", -1);
 	new bool:fail=true;
 	
-	if (callfunc_begin_i(func, -1)==1)
+	if (func != -1 && callfunc_begin_i(func, -1)==1)
 	{
 		callfunc_push_int(_:id);
 		callfunc_push_int(_:err);