diff --git a/dlls/hamsandwich/call_funcs.h b/dlls/hamsandwich/call_funcs.h
index 150a3009..ca9a503d 100644
--- a/dlls/hamsandwich/call_funcs.h
+++ b/dlls/hamsandwich/call_funcs.h
@@ -2,53 +2,53 @@
 #define HOOK_Call_H
 
 
-int Call_Void_Void(AMX *amx, cell *params);
+cell Call_Void_Void(AMX *amx, cell *params);
 
-int Call_Int_Void(AMX *amx, cell *params);
+cell Call_Int_Void(AMX *amx, cell *params);
 
-int Call_Void_Entvar(AMX *amx, cell *params);
+cell Call_Void_Entvar(AMX *amx, cell *params);
 
-int Call_Void_Cbase(AMX *amx, cell *params);
+cell Call_Void_Cbase(AMX *amx, cell *params);
 
-int Call_Int_Float_Int(AMX *amx, cell *params);
+cell Call_Int_Float_Int(AMX *amx, cell *params);
 	
-int Call_Void_Entvar_Int(AMX *amx, cell *params);
+cell Call_Void_Entvar_Int(AMX *amx, cell *params);
 
-int Call_Int_Cbase(AMX *amx, cell *params);
+cell Call_Int_Cbase(AMX *amx, cell *params);
 
-int Call_Void_Int_Int(AMX *amx, cell *params);
+cell Call_Void_Int_Int(AMX *amx, cell *params);
 
-int Call_Int_Int_Str_Int(AMX *amx, cell *params);
+cell Call_Int_Int_Str_Int(AMX *amx, cell *params);
 
-int Call_Int_Int(AMX *amx, cell *params);
+cell Call_Int_Int(AMX *amx, cell *params);
 
-int Call_Int_Entvar(AMX *amx, cell *params);
+cell Call_Int_Entvar(AMX *amx, cell *params);
 
-int Call_Int_Entvar_Entvar_Float_Int(AMX *amx, cell *params);
+cell Call_Int_Entvar_Entvar_Float_Int(AMX *amx, cell *params);
 
-int Call_Void_Int(AMX *amx, cell *params);
+cell Call_Void_Int(AMX *amx, cell *params);
 
-int Call_Void_Cbase_Cbase_Int_Float(AMX *amx, cell *params);
+cell Call_Void_Cbase_Cbase_Int_Float(AMX *amx, cell *params);
 
-int Call_Void_Entvar_Float_Vector_Trace_Int(AMX *amx, cell *params);
+cell Call_Void_Entvar_Float_Vector_Trace_Int(AMX *amx, cell *params);
 
-int Call_Void_Float_Vector_TraceResult_Int(AMX *amx, cell *params);
+cell Call_Void_Float_Vector_TraceResult_Int(AMX *amx, cell *params);
 
-int Call_Str_Void(AMX *amx, cell *params);
+cell Call_Str_Void(AMX *amx, cell *params);
 
-int Call_Cbase_Void(AMX *amx, cell *params);
+cell Call_Cbase_Void(AMX *amx, cell *params);
 
-int Call_Vector_Void(AMX *amx, cell *params);
+cell Call_Vector_Void(AMX *amx, cell *params);
 
-int Call_Vector_pVector(AMX *amx, cell *params);
+cell Call_Vector_pVector(AMX *amx, cell *params);
 
-int Call_Int_pVector(AMX *amx, cell *params);
+cell Call_Int_pVector(AMX *amx, cell *params);
 
-int Call_Void_Entvar_Float_Float(AMX *amx, cell *params);
+cell Call_Void_Entvar_Float_Float(AMX *amx, cell *params);
 
-int Call_Int_pFloat_pFloat(AMX *amx, cell *params);
+cell Call_Int_pFloat_pFloat(AMX *amx, cell *params);
 
-int Call_Void_Entvar_Float(AMX *amx, cell *params);
+cell Call_Void_Entvar_Float(AMX *amx, cell *params);
 
 
 #endif
diff --git a/dlls/hamsandwich/ecall_funcs.h b/dlls/hamsandwich/ecall_funcs.h
index e7bbfaf3..926de58a 100644
--- a/dlls/hamsandwich/ecall_funcs.h
+++ b/dlls/hamsandwich/ecall_funcs.h
@@ -2,53 +2,53 @@
 #define HOOK_ECALL_H
 
 
-int eCall_Void_Void(AMX *amx, cell *params);
+cell eCall_Void_Void(AMX *amx, cell *params);
 
-int eCall_Int_Void(AMX *amx, cell *params);
+cell eCall_Int_Void(AMX *amx, cell *params);
 
-int eCall_Void_Entvar(AMX *amx, cell *params);
+cell eCall_Void_Entvar(AMX *amx, cell *params);
 
-int eCall_Void_Cbase(AMX *amx, cell *params);
+cell eCall_Void_Cbase(AMX *amx, cell *params);
 
-int eCall_Int_Float_Int(AMX *amx, cell *params);
+cell eCall_Int_Float_Int(AMX *amx, cell *params);
 	
-int eCall_Void_Entvar_Int(AMX *amx, cell *params);
+cell eCall_Void_Entvar_Int(AMX *amx, cell *params);
 
-int eCall_Int_Cbase(AMX *amx, cell *params);
+cell eCall_Int_Cbase(AMX *amx, cell *params);
 
-int eCall_Void_Int_Int(AMX *amx, cell *params);
+cell eCall_Void_Int_Int(AMX *amx, cell *params);
 
-int eCall_Int_Int_Str_Int(AMX *amx, cell *params);
+cell eCall_Int_Int_Str_Int(AMX *amx, cell *params);
 
-int eCall_Int_Int(AMX *amx, cell *params);
+cell eCall_Int_Int(AMX *amx, cell *params);
 
-int eCall_Int_Entvar(AMX *amx, cell *params);
+cell eCall_Int_Entvar(AMX *amx, cell *params);
 
-int eCall_Int_Entvar_Entvar_Float_Int(AMX *amx, cell *params);
+cell eCall_Int_Entvar_Entvar_Float_Int(AMX *amx, cell *params);
 
-int eCall_Void_Int(AMX *amx, cell *params);
+cell eCall_Void_Int(AMX *amx, cell *params);
 
-int eCall_Void_Cbase_Cbase_Int_Float(AMX *amx, cell *params);
+cell eCall_Void_Cbase_Cbase_Int_Float(AMX *amx, cell *params);
 
-int eCall_Void_Entvar_Float_Vector_Trace_Int(AMX *amx, cell *params);
+cell eCall_Void_Entvar_Float_Vector_Trace_Int(AMX *amx, cell *params);
 
-int eCall_Void_Float_Vector_TraceResult_Int(AMX *amx, cell *params);
+cell eCall_Void_Float_Vector_TraceResult_Int(AMX *amx, cell *params);
 
-int eCall_Str_Void(AMX *amx, cell *params);
+cell eCall_Str_Void(AMX *amx, cell *params);
 
-int eCall_Cbase_Void(AMX *amx, cell *params);
+cell eCall_Cbase_Void(AMX *amx, cell *params);
 
-int eCall_Vector_Void(AMX *amx, cell *params);
+cell eCall_Vector_Void(AMX *amx, cell *params);
 
-int eCall_Vector_pVector(AMX *amx, cell *params);
+cell eCall_Vector_pVector(AMX *amx, cell *params);
 
-int eCall_Int_pVector(AMX *amx, cell *params);
+cell eCall_Int_pVector(AMX *amx, cell *params);
 
-int eCall_Void_Entvar_Float_Float(AMX *amx, cell *params);
+cell eCall_Void_Entvar_Float_Float(AMX *amx, cell *params);
 
-int eCall_Int_pFloat_pFloat(AMX *amx, cell *params);
+cell eCall_Int_pFloat_pFloat(AMX *amx, cell *params);
 
-int eCall_Void_Entvar_Float(AMX *amx, cell *params);
+cell eCall_Void_Entvar_Float(AMX *amx, cell *params);
 
 
 #endif
diff --git a/dlls/hamsandwich/hooklist.h b/dlls/hamsandwich/hooklist.h
index c33e5149..dd3d2d3d 100644
--- a/dlls/hamsandwich/hooklist.h
+++ b/dlls/hamsandwich/hooklist.h
@@ -10,8 +10,8 @@ typedef struct hook_s
 	int  paramcount;						// how many parameters are in the func
 	void *targetfunc;						// the target hook
 	int (*makefunc)(AMX *, const char*);	// function that creates forwards
-	int (*call)(AMX *, cell*);				// function to call the vcall
-	int (*ecall)(AMX *, cell*);				// function to ecall the vcall
+	cell (*call)(AMX *, cell*);				// function to call the vcall
+	cell (*ecall)(AMX *, cell*);				// function to ecall the vcall
 } hook_t;
 
 extern hook_t hooklist[];