Fixed Makefile

Fixed a few forwards not having FP_DONE at the end (doh!)

dlls/hamsandwich/Makefile

@@ -7,14 +7,7 @@ MM_ROOT = ../../metamod/metamod
 ### EDIT BELOW FOR OTHER PROJECTS ###
 
 
-CRAZY_OPT_FLAGS = -DCRAZY_OPTS -O3 -funroll-loops -ffast-math -s -pipe -fomit-frame-pointer -fno-strict-aliasing -DNDEBUG -fmerge-all-constants -fmodulo-sched -fgcse-sm -fgcse-las -fgcse-after-reload -floop-optimize2 -funsafe-loop-optimizations -ftree-loop-linear -ftree-loop-im -ftree-loop-ivcanon -fivopts -ftree-vectorize -fvariable-expansion-in-unroller -funsafe-math-optimizations -ffinite-math-only  -fpeel-loops -funswitch-loops -fvisibility=hidden -fvisibility-inlines-hidden -fPIC -Wall -Wno-unknown-pragmas -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion -Wsign-compare -Wmissing-noreturn -Winline -Wlong-long -Wunsafe-loop-optimizations -Wctor-dtor-privacy -Wno-non-virtual-dtor -Wreorder -Woverloaded-virtual -Wsign-promo -Wsynth -shared 
+OPT_FLAGS = -O3 -funroll-loops -s -pipe -fomit-frame-pointer -fno-strict-aliasing -DNDEBUG
-
-CRAZY_LINK_FLAGS = -fwhole-program
-#-fwhole-program -combine
-
-SANE_OPT_FLAGS = -O3 -funroll-loops -s -pipe -fomit-frame-pointer -fno-strict-aliasing -DNDEBUG
-
-OPT_FLAGS =
 
 DEBUG_FLAGS = -g -ggdb3
 CPP = gcc-4.1
@@ -39,14 +32,8 @@ ifeq "$(DEBUG)" "true"
 	BIN_DIR = Debug
 	CFLAGS = $(DEBUG_FLAGS)
 else
-	ifeq "$(CRAZY)" "true"
+	BIN_DIR = Release
-		BIN_DIR = Optimized
+
-		OPT_FLAGS = $(CRAZY_OPT_FLAGS)
-		LINK = $(CRAZY_LINK_FLAGS)
-	else
-		BIN_DIR = Release
-		OPT_FLAGS = $(SANE_OPT_FLAGS)
-	endif
 	ifeq "$(GCC_VERSION)" "4"
 		OPT_FLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
 	endif
@@ -67,8 +54,6 @@ $(BIN_DIR)/%.o: %.cpp
 all:
 	mkdir -p $(BIN_DIR)
 	mkdir -p $(BIN_DIR)/sdk
-	mkdir -p $(BIN_DIR)/natives
-	mkdir -p $(BIN_DIR)/tableentries
 	$(MAKE) hamsandwich
 
 hamsandwich: $(OBJ_LINUX)
@@ -79,23 +64,11 @@ debug:
 
 default: all
 
-crazy:
-	$(MAKE) all CRAZY=true
-
 clean:
 	rm -rf Release/*.o
 	rm -rf Release/sdk/*.o
-	rm -rf Release/natives/*.o
-	rm -rf Release/tableentries/*.o
 	rm -rf Release/$(NAME)_$(BIN_SUFFIX)
 	rm -rf Debug/*.o
 	rm -rf Debug/sdk/*.o
-	rm -rf Debug/natives/*.o
-	rm -rf Debug/tableentries/*.o
 	rm -rf Debug/$(NAME)_$(BIN_SUFFIX)
-	rm -rf Optimized/*.o
-	rm -rf Optimized/sdk/*.o
-	rm -rf Optimized/natives/*.o
-	rm -rf Optimized/tableentries/*.o
-	rm -rf Optimized/$(NAME)_$(BIN_SUFFIX)
 	

dlls/hamsandwich/hook_callbacks.cpp

@@ -970,6 +970,7 @@ float Hook_Float_Void(Hook *hook, void *pthis)
 	origret=reinterpret_cast<float (*)(void*)>(hook->func)(pthis);
 #endif
 
+	fflush(stdout);
 	POST_START()
 	POST_END()
 

dlls/hamsandwich/hook_callbacks.h

@@ -170,7 +170,7 @@ const int PC_Void_ItemInfo = 1;
 void Hook_Void_ItemInfo(Hook *hook, void *pthis, void *iteminfo);
 
 
-const bool RT_Float_Void = true;
+const bool RT_Float_Void = false;
 const int PC_Float_Void = 0;
 float Hook_Float_Void(Hook *hook, void *pthis);
 

dlls/hamsandwich/hook_create.cpp

@@ -161,9 +161,9 @@ int Create_Void_Int_Int_Int(AMX *amx, const char *func)
 }
 int Create_Void_ItemInfo(AMX *amx, const char *func)
 {
-	return MF_RegisterSPForwardByName(amx, func, FP_CELL, FP_CELL);
+	return MF_RegisterSPForwardByName(amx, func, FP_CELL, FP_CELL, FP_DONE);
 }
 int Create_Float_Void(AMX *amx, const char *func)
 {
-	return MF_RegisterSPForwardByName(amx, func, FP_CELL);
+	return MF_RegisterSPForwardByName(amx, func, FP_CELL, FP_DONE);
 }

dlls/hamsandwich/msvc8/hamsandwich.sln

@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hamsandwich", "hamsandwich.vcproj", "{5E393C37-22F2-4CA2-9022-6400DC582447}"
 EndProject
 Global
@@ -9,8 +9,8 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5E393C37-22F2-4CA2-9022-6400DC582447}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5E393C37-22F2-4CA2-9022-6400DC582447}.Debug|Win32.ActiveCfg = Release|Win32
-		{5E393C37-22F2-4CA2-9022-6400DC582447}.Debug|Win32.Build.0 = Debug|Win32
+		{5E393C37-22F2-4CA2-9022-6400DC582447}.Debug|Win32.Build.0 = Release|Win32
 		{5E393C37-22F2-4CA2-9022-6400DC582447}.Release|Win32.ActiveCfg = Release|Win32
 		{5E393C37-22F2-4CA2-9022-6400DC582447}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection

dlls/hamsandwich/msvc8/hamsandwich.vcproj

@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\..\..\..\hlsdk\dlls;..\..\..\..\hlsdk\common;..\..\..\..\hlsdk\engine\;..\..\..\..\hlsdk\pm_shared; ..\..\..\metamod\metamod"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"