MSVC didn't like my cdecl placement :(

dlls/hamsandwich/msvc8/hs.vcproj

@@ -217,6 +217,10 @@
 		<Filter
 			Name="Entries"
 			>
+			<File
+				RelativePath="..\tableentries\AddPlayerItem.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\tableentries\AddPoints.cpp"
 				>
@@ -229,10 +233,58 @@
 				RelativePath="..\tableentries\Blocked.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\tableentries\BloodColor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tableentries\Classify.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tableentries\GetToggleState.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tableentries\IsAlive.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tableentries\IsBSPModel.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tableentries\IsInWorld.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tableentries\IsMoving.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tableentries\IsNetClient.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tableentries\IsPlayer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tableentries\IsSneaking.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\tableentries\Killed.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\tableentries\ObjectCaps.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tableentries\RemovePlayerItem.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\tableentries\Respawn.cpp"
 				>
@@ -246,7 +298,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\tableentries\TakeHealth.cpp"
+				RelativePath="..\tableentries\Think.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\tableentries\Touch.cpp"
 				>
 			</File>
 			<File

dlls/hamsandwich/tableentries/AddPlayerItem.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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 };