diff --git a/dlls/hamsandwich/msvc8/hs.vcproj b/dlls/hamsandwich/msvc8/hs.vcproj index d6f80a8b..92e683b6 100644 --- a/dlls/hamsandwich/msvc8/hs.vcproj +++ b/dlls/hamsandwich/msvc8/hs.vcproj @@ -217,6 +217,10 @@ + + @@ -229,10 +233,58 @@ RelativePath="..\tableentries\Blocked.cpp" > + + + + + + + + + + + + + + + + + + + + + + + + @@ -246,7 +298,11 @@ > + + Execute(pthis,item); } diff --git a/dlls/hamsandwich/tableentries/AddPoints.cpp b/dlls/hamsandwich/tableentries/AddPoints.cpp index 5a3ab6f8..346299bf 100644 --- a/dlls/hamsandwich/tableentries/AddPoints.cpp +++ b/dlls/hamsandwich/tableentries/AddPoints.cpp @@ -357,7 +357,7 @@ void ThisVTable::Execute(void *pthis,int points, int allownegative) } }; -HAM_CDECL void ThisVTable::EntryPoint(int id,void *pthis,int points,int allownegative) +void HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis,int points,int allownegative) { VTMan.ThisEntries[id]->Execute(pthis,points,allownegative); } diff --git a/dlls/hamsandwich/tableentries/AddPointsToTeam.cpp b/dlls/hamsandwich/tableentries/AddPointsToTeam.cpp index d65aa992..04a2a81a 100644 --- a/dlls/hamsandwich/tableentries/AddPointsToTeam.cpp +++ b/dlls/hamsandwich/tableentries/AddPointsToTeam.cpp @@ -356,7 +356,7 @@ void ThisVTable::Execute(void *pthis,int points, int allownegative) } }; -HAM_CDECL void ThisVTable::EntryPoint(int id,void *pthis,int points,int allownegative) +void HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis,int points,int allownegative) { VTMan.ThisEntries[id]->Execute(pthis,points,allownegative); } diff --git a/dlls/hamsandwich/tableentries/Blocked.cpp b/dlls/hamsandwich/tableentries/Blocked.cpp index 8ae7cd4b..ae0e86eb 100644 --- a/dlls/hamsandwich/tableentries/Blocked.cpp +++ b/dlls/hamsandwich/tableentries/Blocked.cpp @@ -360,7 +360,7 @@ void ThisVTable::Execute(void *pthis, void *other) } }; -HAM_CDECL void ThisVTable::EntryPoint(int id,void *pthis,void *other) +void HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis,void *other) { VTMan.ThisEntries[id]->Execute(pthis,other); } diff --git a/dlls/hamsandwich/tableentries/BloodColor.cpp b/dlls/hamsandwich/tableentries/BloodColor.cpp index c2ee0bd1..e5a06596 100644 --- a/dlls/hamsandwich/tableentries/BloodColor.cpp +++ b/dlls/hamsandwich/tableentries/BloodColor.cpp @@ -360,7 +360,7 @@ int ThisVTable::Execute(void *pthis) return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { return VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/Classify.cpp b/dlls/hamsandwich/tableentries/Classify.cpp index 27585412..01cda95c 100644 --- a/dlls/hamsandwich/tableentries/Classify.cpp +++ b/dlls/hamsandwich/tableentries/Classify.cpp @@ -360,7 +360,7 @@ int ThisVTable::Execute(void *pthis) return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { return VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/GetToggleState.cpp b/dlls/hamsandwich/tableentries/GetToggleState.cpp index 226f7a3b..a7a60073 100644 --- a/dlls/hamsandwich/tableentries/GetToggleState.cpp +++ b/dlls/hamsandwich/tableentries/GetToggleState.cpp @@ -360,7 +360,7 @@ int ThisVTable::Execute(void *pthis) return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { return VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/IsAlive.cpp b/dlls/hamsandwich/tableentries/IsAlive.cpp index 3a2fc800..36be3632 100644 --- a/dlls/hamsandwich/tableentries/IsAlive.cpp +++ b/dlls/hamsandwich/tableentries/IsAlive.cpp @@ -360,7 +360,7 @@ int ThisVTable::Execute(void *pthis) return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { return VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/IsBSPModel.cpp b/dlls/hamsandwich/tableentries/IsBSPModel.cpp index 938d5d05..e66c8a93 100644 --- a/dlls/hamsandwich/tableentries/IsBSPModel.cpp +++ b/dlls/hamsandwich/tableentries/IsBSPModel.cpp @@ -360,7 +360,7 @@ int ThisVTable::Execute(void *pthis) return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { return VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/IsInWorld.cpp b/dlls/hamsandwich/tableentries/IsInWorld.cpp index 4fc5a0ff..1cb1bb44 100644 --- a/dlls/hamsandwich/tableentries/IsInWorld.cpp +++ b/dlls/hamsandwich/tableentries/IsInWorld.cpp @@ -360,7 +360,7 @@ int ThisVTable::Execute(void *pthis) return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { return VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/IsMoving.cpp b/dlls/hamsandwich/tableentries/IsMoving.cpp index 83f7f6e4..071fa891 100644 --- a/dlls/hamsandwich/tableentries/IsMoving.cpp +++ b/dlls/hamsandwich/tableentries/IsMoving.cpp @@ -360,7 +360,7 @@ int ThisVTable::Execute(void *pthis) return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { return VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/IsNetClient.cpp b/dlls/hamsandwich/tableentries/IsNetClient.cpp index 4253fb33..8e20c080 100644 --- a/dlls/hamsandwich/tableentries/IsNetClient.cpp +++ b/dlls/hamsandwich/tableentries/IsNetClient.cpp @@ -360,7 +360,7 @@ int ThisVTable::Execute(void *pthis) return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { return VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/IsPlayer.cpp b/dlls/hamsandwich/tableentries/IsPlayer.cpp index 2ccd0125..7a18d2a2 100644 --- a/dlls/hamsandwich/tableentries/IsPlayer.cpp +++ b/dlls/hamsandwich/tableentries/IsPlayer.cpp @@ -360,7 +360,7 @@ int ThisVTable::Execute(void *pthis) return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { return VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/IsSneaking.cpp b/dlls/hamsandwich/tableentries/IsSneaking.cpp index bd97ef51..33320cff 100644 --- a/dlls/hamsandwich/tableentries/IsSneaking.cpp +++ b/dlls/hamsandwich/tableentries/IsSneaking.cpp @@ -360,7 +360,7 @@ int ThisVTable::Execute(void *pthis) return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { return VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/Killed.cpp b/dlls/hamsandwich/tableentries/Killed.cpp index b51ec3c6..07de882a 100644 --- a/dlls/hamsandwich/tableentries/Killed.cpp +++ b/dlls/hamsandwich/tableentries/Killed.cpp @@ -361,7 +361,7 @@ void ThisVTable::Execute(void *pthis, void *attacker, int gib) } }; -HAM_CDECL void ThisVTable::EntryPoint(int id,void *pthis,void *attacker,int gib) +void HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis,void *attacker,int gib) { VTMan.ThisEntries[id]->Execute(pthis,attacker,gib); } diff --git a/dlls/hamsandwich/tableentries/ObjectCaps.cpp b/dlls/hamsandwich/tableentries/ObjectCaps.cpp index 130194ae..da31ab65 100644 --- a/dlls/hamsandwich/tableentries/ObjectCaps.cpp +++ b/dlls/hamsandwich/tableentries/ObjectCaps.cpp @@ -360,7 +360,7 @@ int ThisVTable::Execute(void *pthis) return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { return VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/RemovePlayerItem.cpp b/dlls/hamsandwich/tableentries/RemovePlayerItem.cpp index 0a75b34f..3836ef17 100644 --- a/dlls/hamsandwich/tableentries/RemovePlayerItem.cpp +++ b/dlls/hamsandwich/tableentries/RemovePlayerItem.cpp @@ -365,7 +365,7 @@ int ThisVTable::Execute(void *pthis, void *item) return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis,void *item) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis,void *item) { return VTMan.ThisEntries[id]->Execute(pthis,item); } diff --git a/dlls/hamsandwich/tableentries/Restart.cpp b/dlls/hamsandwich/tableentries/Restart.cpp index f7900210..c862f7fb 100644 --- a/dlls/hamsandwich/tableentries/Restart.cpp +++ b/dlls/hamsandwich/tableentries/Restart.cpp @@ -350,7 +350,7 @@ void ThisVTable::Execute(void *pthis) } }; -HAM_CDECL void ThisVTable::EntryPoint(int id,void *pthis) +void HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/TakeDamage.cpp b/dlls/hamsandwich/tableentries/TakeDamage.cpp index 792db305..6010db8a 100644 --- a/dlls/hamsandwich/tableentries/TakeDamage.cpp +++ b/dlls/hamsandwich/tableentries/TakeDamage.cpp @@ -375,7 +375,7 @@ int ThisVTable::Execute(void *pthis, void *inflictor, void *attacker, float dama return 0; }; -HAM_CDECL int ThisVTable::EntryPoint(int id,void *pthis,void *inflictor,void *attacker,float damage,int type) +int HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis,void *inflictor,void *attacker,float damage,int type) { return VTMan.ThisEntries[id]->Execute(pthis,inflictor,attacker,damage,type); } diff --git a/dlls/hamsandwich/tableentries/Think.cpp b/dlls/hamsandwich/tableentries/Think.cpp index 4744e365..91ff509a 100644 --- a/dlls/hamsandwich/tableentries/Think.cpp +++ b/dlls/hamsandwich/tableentries/Think.cpp @@ -350,7 +350,7 @@ void ThisVTable::Execute(void *pthis) } }; -HAM_CDECL void ThisVTable::EntryPoint(int id,void *pthis) +void HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis) { VTMan.ThisEntries[id]->Execute(pthis); } diff --git a/dlls/hamsandwich/tableentries/Touch.cpp b/dlls/hamsandwich/tableentries/Touch.cpp index d8f0907d..806497ab 100644 --- a/dlls/hamsandwich/tableentries/Touch.cpp +++ b/dlls/hamsandwich/tableentries/Touch.cpp @@ -360,7 +360,7 @@ void ThisVTable::Execute(void *pthis, void *other) } }; -HAM_CDECL void ThisVTable::EntryPoint(int id,void *pthis,void *other) +void HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis,void *other) { VTMan.ThisEntries[id]->Execute(pthis,other); } diff --git a/dlls/hamsandwich/tableentries/Use.cpp b/dlls/hamsandwich/tableentries/Use.cpp index 6bfaf8d7..59ee5940 100644 --- a/dlls/hamsandwich/tableentries/Use.cpp +++ b/dlls/hamsandwich/tableentries/Use.cpp @@ -373,7 +373,7 @@ void ThisVTable::Execute(void *pthis, void *activator, void *caller, int type, f }; }; -HAM_CDECL void ThisVTable::EntryPoint(int id,void *pthis,void *activator,void *caller,int type,float value) +void HAM_CDECL ThisVTable::EntryPoint(int id,void *pthis,void *activator,void *caller,int type,float value) { VTMan.ThisEntries[id]->Execute(pthis,activator,caller,type,value); } diff --git a/dlls/hamsandwich/tableentries/VTableEntries.h b/dlls/hamsandwich/tableentries/VTableEntries.h index cc2a17b5..7ff6061b 100644 --- a/dlls/hamsandwich/tableentries/VTableEntries.h +++ b/dlls/hamsandwich/tableentries/VTableEntries.h @@ -286,7 +286,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis); + static int HAM_CDECL EntryPoint(int id,void *pthis); }; @@ -399,7 +399,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis); + static int HAM_CDECL EntryPoint(int id,void *pthis); }; @@ -516,7 +516,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL void EntryPoint(int id,void *pthis,void *pevattacker,float flDamage,float *direction,void *tr,int bits); + static void HAM_CDECL EntryPoint(int id,void *pthis,void *pevattacker,float flDamage,float *direction,void *tr,int bits); }; // int TakeDamage(entvars_t *inflictor, entvars_t *attacker, float damage, int type); class VTableTakeDamage : public VTableEntryBase @@ -632,7 +632,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis,void *inflictor,void *attacker,float damage,int type); + static int HAM_CDECL EntryPoint(int id,void *pthis,void *inflictor,void *attacker,float damage,int type); }; // int BloodColor(void) TODO class VTableBloodColor : public VTableEntryBase @@ -743,7 +743,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis); + static int HAM_CDECL EntryPoint(int id,void *pthis); }; @@ -860,7 +860,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL void EntryPoint(int id,void *pthis,void *attacker, int gib); + static void HAM_CDECL EntryPoint(int id,void *pthis,void *attacker, int gib); }; // void Restart(void) CS ONLY class VTableRestart : public VTableEntryBase @@ -973,7 +973,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL void EntryPoint(int id,void *pthis); + static void HAM_CDECL EntryPoint(int id,void *pthis); }; // int GetToggleState(void) TODO class VTableGetToggleState : public VTableEntryBase @@ -1084,7 +1084,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis); + static int HAM_CDECL EntryPoint(int id,void *pthis); }; @@ -1200,7 +1200,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL void EntryPoint(int id,void *pthis,int points,int allownegative); + static void HAM_CDECL EntryPoint(int id,void *pthis,int points,int allownegative); }; // void AddPointsToTeam(int points, int allownegative) class VTableAddPointsToTeam : public VTableEntryBase @@ -1313,7 +1313,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL void EntryPoint(int id,void *pthis,int points,int allownegative); + static void HAM_CDECL EntryPoint(int id,void *pthis,int points,int allownegative); }; // int AddPlayerItem(CBasePlayerItem *item); @@ -1428,7 +1428,7 @@ public: * @param pthis The "this" pointer. * @param item The private data of the item being added. */ - static HAM_CDECL int EntryPoint(int id,void *pthis,void *item); + static int HAM_CDECL EntryPoint(int id,void *pthis,void *item); }; // int RemovePlayerItem(CBasePlayerItem *item); class VTableRemovePlayerItem : public VTableEntryBase @@ -1542,7 +1542,7 @@ public: * @param pthis The "this" pointer. * @param item The private data of the item being added. */ - static HAM_CDECL int EntryPoint(int id,void *pthis,void *item); + static int HAM_CDECL EntryPoint(int id,void *pthis,void *item); }; @@ -1663,7 +1663,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis); + static int HAM_CDECL EntryPoint(int id,void *pthis); }; @@ -1777,7 +1777,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis); + static int HAM_CDECL EntryPoint(int id,void *pthis); }; @@ -1892,7 +1892,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis); + static int HAM_CDECL EntryPoint(int id,void *pthis); }; @@ -2005,7 +2005,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis); + static int HAM_CDECL EntryPoint(int id,void *pthis); }; @@ -2118,7 +2118,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis); + static int HAM_CDECL EntryPoint(int id,void *pthis); }; @@ -2231,7 +2231,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis); + static int HAM_CDECL EntryPoint(int id,void *pthis); }; @@ -2344,7 +2344,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis); + static int HAM_CDECL EntryPoint(int id,void *pthis); }; @@ -2457,7 +2457,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL int EntryPoint(int id,void *pthis); + static int HAM_CDECL EntryPoint(int id,void *pthis); }; @@ -2572,7 +2572,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL const char *EntryPoint(int id,void *pthis); + static const char* HAM_CDECL EntryPoint(int id,void *pthis); }; // void Think(void) TODO @@ -2686,7 +2686,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL void EntryPoint(int id,void *pthis); + static void HAM_CDECL EntryPoint(int id,void *pthis); }; // void Touch(void *pOther) TODO class VTableTouch : public VTableEntryBase @@ -2799,7 +2799,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL void EntryPoint(int id,void *pthis,void *other); + static void HAM_CDECL EntryPoint(int id,void *pthis,void *other); }; // void Use(CBaseEntity *activator, CBaseEntity *caller, USE_TYPE type, float value) class VTableUse : public VTableEntryBase @@ -2915,7 +2915,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL void EntryPoint(int id,void *pthis, void *activator, void *caller, int type, float value); + static void HAM_CDECL EntryPoint(int id,void *pthis, void *activator, void *caller, int type, float value); }; // void Blocked(CBaseEntity *pOther) @@ -3029,7 +3029,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL void EntryPoint(int id,void *pthis,void *other); + static void HAM_CDECL EntryPoint(int id,void *pthis,void *other); }; // CBaseEntity *Respawn(void) @@ -3143,7 +3143,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL void *EntryPoint(int id,void *pthis); + static void* HAM_CDECL EntryPoint(int id,void *pthis); }; // void UpdateOwner(void) TODO @@ -3257,7 +3257,7 @@ public: * @param id The index of the hook to call. * @param pthis The "this" pointer. */ - static HAM_CDECL void EntryPoint(int id,void *pthis); + static void HAM_CDECL EntryPoint(int id,void *pthis); };