From 285a4ffed8a217c43178f068a51bae2b36230bfa Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 29 Jun 2004 06:26:56 +0000 Subject: [PATCH] Fixed a few bugs. --- dlls/engine/Makefile | 2 +- dlls/engine/engine.cpp | 2 +- dlls/engine/forwards.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/engine/Makefile b/dlls/engine/Makefile index ac633688..5e15a636 100755 --- a/dlls/engine/Makefile +++ b/dlls/engine/Makefile @@ -56,7 +56,7 @@ OBJ_LINUX := $(SRCFILES:%.cpp=$(OBJDIR_LINUX)/%.o) OBJ_WIN32 := $(SRCFILES:%.cpp=$(OBJDIR_WIN32)/%.o) CCOPT = -march=i386 -O2 -ffast-math -funroll-loops \ - -s -DNDEBUG + -fomit-frame-pointer -s -DNDEBUG INCLUDEDIRS=-I../curl/include -I$(SRCDIR) -I$(AMXDIR) -I$(METADIR) -I$(SDKSRC)/engine -I$(SDKSRC)/common -I$(SDKSRC)/pm_shared -I$(SDKSRC)/dlls -I$(SDKSRC) $(EXTRA_INCLUDEDIRS) CFLAGS=-Wall -Wno-unknown-pragmas diff --git a/dlls/engine/engine.cpp b/dlls/engine/engine.cpp index 2fbd4a29..d4309700 100755 --- a/dlls/engine/engine.cpp +++ b/dlls/engine/engine.cpp @@ -2040,7 +2040,7 @@ static cell AMX_NATIVE_CALL dllfunc(AMX *amx,cell *params) return gpGamedllFuncs->dllapi_table->pfnPM_FindTextureType(temp); case DLLFunc_RegisterEncoders: // void ) ( void ); - gpGamedllFuncs->dllapi_table->pfnRegisterEncoders; + gpGamedllFuncs->dllapi_table->pfnRegisterEncoders(); return 1; // Enumerates player hulls. Returns 0 if the hull number doesn't exist, 1 otherwise diff --git a/dlls/engine/forwards.cpp b/dlls/engine/forwards.cpp index 2d63fc07..58230d7c 100755 --- a/dlls/engine/forwards.cpp +++ b/dlls/engine/forwards.cpp @@ -235,9 +235,9 @@ void DispatchTouch(edict_t *pToucher, edict_t *pTouched) const char *ptdClass = STRING(pTouched->v.classname); for (i=0; iToucher = 0) + if (Touches[i]->Toucher == 0) { - if (Touches[i]->Touched = 0) + if (Touches[i]->Touched == 0) { retVal = MF_ExecuteForward(Touches[i]->Forward, ENTINDEX(pToucher), ENTINDEX(pTouched)); if (retVal) @@ -252,7 +252,7 @@ void DispatchTouch(edict_t *pToucher, edict_t *pTouched) RETURN_META(MRES_IGNORED); } } else if (fstrcmp(Touches[i]->Toucher, ptrClass)) { - if (Touches[i]->Touched = 0) + if (Touches[i]->Touched == 0) { retVal = MF_ExecuteForward(Touches[i]->Forward, ENTINDEX(pToucher), ENTINDEX(pTouched)); if (retVal) @@ -297,4 +297,4 @@ void DispatchThink_Post(edict_t *pent) MF_ExecuteForward(pfnThinkForward, ENTINDEX(pent)); RETURN_META(MRES_IGNORED); -} \ No newline at end of file +}