From ee64440fef2dba15df066004ffdb4807ef3e009a Mon Sep 17 00:00:00 2001 From: Steve Dudenhoeffer Date: Thu, 10 May 2007 17:17:33 +0000 Subject: [PATCH] Removed TFC_DBGetItemName because I can't figure out the return value syntax (it doesn't sound like a useful function anyway). Disassembled DoD for the new virtual functions. Fixed cs weapon virtual functions. Oops :o --- dlls/hamsandwich/config/hamdata.ini | 180 +++++++++++++++++------ dlls/hamsandwich/ham_const.h | 1 - dlls/hamsandwich/hook_native.cpp | 2 - dlls/hamsandwich/include/hamsandwich.inc | 1 - 4 files changed, 135 insertions(+), 49 deletions(-) diff --git a/dlls/hamsandwich/config/hamdata.ini b/dlls/hamsandwich/config/hamdata.ini index 94d76db4..08bb342a 100644 --- a/dlls/hamsandwich/config/hamdata.ini +++ b/dlls/hamsandwich/config/hamdata.ini @@ -132,22 +132,22 @@ item_secondaryammoindex 77 item_updateclientdata 78 item_getweaponptr 79 - item_itemslot 80 + item_itemslot 81 - weapon_extractammo 81 - weapon_extractclipammo 82 - weapon_addweapon 83 - weapon_playemptysound 84 - weapon_resetemptysound 85 - weapon_sendweaponanim 86 - weapon_isusable 87 - weapon_primaryattack 88 - weapon_secondaryattack 89 - weapon_reload 90 - weapon_weaponidle 91 - weapon_retireweapon 92 - weapon_shouldweaponidle 93 - weapon_usedecrement 94 + 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 cstrike_restart 4 cstrike_roundrespawn 86 @@ -240,22 +240,22 @@ item_secondaryammoindex 75 item_updateclientdata 76 item_getweaponptr 77 - item_itemslot 78 + item_itemslot 79 - weapon_extractammo 79 - weapon_extractclipammo 80 - weapon_addweapon 81 - weapon_playemptysound 82 - weapon_resetemptysound 83 - weapon_sendweaponanim 84 - weapon_isusable 85 - weapon_primaryattack 86 - weapon_secondaryattack 87 - weapon_reload 88 - weapon_weaponidle 89 - weapon_retireweapon 90 - weapon_shouldweaponidle 91 - weapon_usedecrement 92 + 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 2 cstrike_roundrespawn 84 @@ -265,21 +265,14 @@ pev 0 base 0x154 - dod_roundrespawn 2 - dod_roundrespawnent 3 - dod_roundstore 4 spawn 5 precache 6 keyvalue 7 objectcaps 10 activate 11 - dod_areasetindex 12 - dod_areasendstatus 13 objectcollisionbox 14 classify 15 deathnotice 16 - dod_getstate 17 - dod_getstateent 18 traceattack 19 takedamage 20 takehealth 21 @@ -326,26 +319,71 @@ illumination 62 fvisible 63 fvecvisible 64 + + player_jump 136 + player_duck 137 + player_prethink 134 + player_postthink 135 + player_getgunposition 128 + player_shouldfadeondeath 68 + player_impulsecommands 139 + player_updateclientdata 138 + + item_addtoplayer 66 + item_addduplicate 67 + item_getiteminfo 68 + item_candeploy 69 + item_candrop 72 + item_deploy 70 + item_canholster 75 + item_holster 76 + item_updateiteminfo 77 + item_preframe 78 + item_postframe 79 + item_drop 80 + item_kill 81 + item_attachtoplayer 82 + item_primaryammoindex 83 + item_secondaryammoindex 84 + item_updateclientdata 85 + item_getweaponptr 86 + item_itemslot 87 + + weapon_extractammo 88 + weapon_extractclipammo 89 + weapon_addweapon 90 + weapon_playemptysound 91 + weapon_resetemptysound 92 + weapon_sendweaponanim 93 + weapon_isusable 94 + weapon_primaryattack 104 + weapon_secondaryattack 105 + weapon_reload 106 + weapon_weaponidle 107 + weapon_retireweapon 108 + weapon_shouldweaponidle 109 + weapon_usedecrement 110 + + dod_roundrespawn 2 + dod_roundrespawnent 3 + dod_roundstore 4 + dod_areasetindex 12 + dod_areasendstatus 13 + dod_getstate 17 + dod_getstateent 18 @end @section dod windows pev 4 base 0x0 - dod_roundrespawn 0 - dod_roundrespawnent 1 - dod_roundstore 2 spawn 3 precache 4 keyvalue 5 objectcaps 8 activate 9 - dod_areasetindex 10 - dod_areasendstatus 11 objectcollisionbox 12 classify 13 deathnotice 14 - dod_getstate 15 - dod_getstateent 16 traceattack 17 takedamage 18 takehealth 19 @@ -392,6 +430,58 @@ illumination 60 fvisible 61 fvecvisible 62 + + player_jump 134 + player_duck 135 + player_prethink 132 + player_postthink 133 + player_getgunposition 126 + player_shouldfadeondeath 66 + player_impulsecommands 137 + player_updateclientdata 136 + + item_addtoplayer 64 + item_addduplicate 65 + item_getiteminfo 66 + item_candeploy 67 + item_candrop 70 + item_deploy 68 + 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 85 + + weapon_extractammo 86 + weapon_extractclipammo 87 + weapon_addweapon 88 + weapon_playemptysound 89 + weapon_resetemptysound 90 + weapon_sendweaponanim 91 + weapon_isusable 92 + weapon_primaryattack 102 + weapon_secondaryattack 103 + weapon_reload 104 + weapon_weaponidle 105 + weapon_retireweapon 106 + weapon_shouldweaponidle 107 + weapon_usedecrement 108 + + dod_roundrespawn 0 + dod_roundrespawnent 1 + dod_roundstore 2 + dod_areasetindex 10 + dod_areasendstatus 11 + dod_getstate 15 + dod_getstateent 16 @end ; TFC Does not have the following "standard" entries in its vtable: @@ -437,7 +527,6 @@ isinworld 39 isplayer 40 isnetclient 41 - tfc_dbgetitemname 42 getnexttarget 43 think 44 touch 45 @@ -453,6 +542,7 @@ illumination 55 fvisible 56 fvecvisible 57 + tfc_engineeruse 58 tfc_finished 59 tfc_empexplode 60 diff --git a/dlls/hamsandwich/ham_const.h b/dlls/hamsandwich/ham_const.h index 24433149..946a8b3a 100644 --- a/dlls/hamsandwich/ham_const.h +++ b/dlls/hamsandwich/ham_const.h @@ -127,7 +127,6 @@ enum Ham_DOD_GetState, Ham_DOD_GetStateEnt, - Ham_TFC_DbGetItemName, Ham_TFC_EngineerUse, Ham_TFC_Finished, Ham_TFC_EmpExplode, diff --git a/dlls/hamsandwich/hook_native.cpp b/dlls/hamsandwich/hook_native.cpp index a5431c4d..d7257a67 100644 --- a/dlls/hamsandwich/hook_native.cpp +++ b/dlls/hamsandwich/hook_native.cpp @@ -154,8 +154,6 @@ hook_t hooklist[] = /* Team Fortress Classic */ - // This next one is just a huge guess - { V("tfc_dbgetitemname", Str_Void) }, { V("tfc_engineeruse", Int_Cbase) }, { V("tfc_finished", Void_Void) }, { V("tfc_empexplode", Void_Entvar_Float_Float) }, diff --git a/dlls/hamsandwich/include/hamsandwich.inc b/dlls/hamsandwich/include/hamsandwich.inc index 4f6728b0..230df400 100644 --- a/dlls/hamsandwich/include/hamsandwich.inc +++ b/dlls/hamsandwich/include/hamsandwich.inc @@ -492,7 +492,6 @@ enum Ham Ham_DOD_GetState, Ham_DOD_GetStateEnt, - Ham_TFC_DbGetItemName, Ham_TFC_EngineerUse, Ham_TFC_Finished, Ham_TFC_EmpExplode,