mirror of
https://github.com/alliedmodders/amxmodx.git
synced 2024-12-24 13:55:36 +03:00
Fixed a few bugs.
This commit is contained in:
parent
e8d33e1379
commit
285a4ffed8
@ -56,7 +56,7 @@ OBJ_LINUX := $(SRCFILES:%.cpp=$(OBJDIR_LINUX)/%.o)
|
|||||||
OBJ_WIN32 := $(SRCFILES:%.cpp=$(OBJDIR_WIN32)/%.o)
|
OBJ_WIN32 := $(SRCFILES:%.cpp=$(OBJDIR_WIN32)/%.o)
|
||||||
|
|
||||||
CCOPT = -march=i386 -O2 -ffast-math -funroll-loops \
|
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)
|
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
|
CFLAGS=-Wall -Wno-unknown-pragmas
|
||||||
|
@ -2040,7 +2040,7 @@ static cell AMX_NATIVE_CALL dllfunc(AMX *amx,cell *params)
|
|||||||
return gpGamedllFuncs->dllapi_table->pfnPM_FindTextureType(temp);
|
return gpGamedllFuncs->dllapi_table->pfnPM_FindTextureType(temp);
|
||||||
|
|
||||||
case DLLFunc_RegisterEncoders: // void ) ( void );
|
case DLLFunc_RegisterEncoders: // void ) ( void );
|
||||||
gpGamedllFuncs->dllapi_table->pfnRegisterEncoders;
|
gpGamedllFuncs->dllapi_table->pfnRegisterEncoders();
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
// Enumerates player hulls. Returns 0 if the hull number doesn't exist, 1 otherwise
|
// Enumerates player hulls. Returns 0 if the hull number doesn't exist, 1 otherwise
|
||||||
|
@ -235,9 +235,9 @@ void DispatchTouch(edict_t *pToucher, edict_t *pTouched)
|
|||||||
const char *ptdClass = STRING(pTouched->v.classname);
|
const char *ptdClass = STRING(pTouched->v.classname);
|
||||||
for (i=0; i<Touches.size(); i++)
|
for (i=0; i<Touches.size(); i++)
|
||||||
{
|
{
|
||||||
if (Touches[i]->Toucher = 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));
|
retVal = MF_ExecuteForward(Touches[i]->Forward, ENTINDEX(pToucher), ENTINDEX(pTouched));
|
||||||
if (retVal)
|
if (retVal)
|
||||||
@ -252,7 +252,7 @@ void DispatchTouch(edict_t *pToucher, edict_t *pTouched)
|
|||||||
RETURN_META(MRES_IGNORED);
|
RETURN_META(MRES_IGNORED);
|
||||||
}
|
}
|
||||||
} else if (fstrcmp(Touches[i]->Toucher, ptrClass)) {
|
} 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));
|
retVal = MF_ExecuteForward(Touches[i]->Forward, ENTINDEX(pToucher), ENTINDEX(pTouched));
|
||||||
if (retVal)
|
if (retVal)
|
||||||
@ -297,4 +297,4 @@ void DispatchThink_Post(edict_t *pent)
|
|||||||
MF_ExecuteForward(pfnThinkForward, ENTINDEX(pent));
|
MF_ExecuteForward(pfnThinkForward, ENTINDEX(pent));
|
||||||
|
|
||||||
RETURN_META(MRES_IGNORED);
|
RETURN_META(MRES_IGNORED);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user