Removed newdllfunc() and related NEWDLLFunc_* stuff. :-P (yes I finally read Alfred's post through)
This commit is contained in:
parent
7d51404aeb
commit
94e19aae0c
|
@ -161,23 +161,12 @@
|
||||||
<File
|
<File
|
||||||
RelativePath=".\engfunc.h">
|
RelativePath=".\engfunc.h">
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath=".\newdllfunc.cpp">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath=".\newdllfunc.h">
|
|
||||||
</File>
|
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter
|
<Filter
|
||||||
Name="pev"
|
Name="pev"
|
||||||
Filter="">
|
Filter="">
|
||||||
<File
|
<File
|
||||||
RelativePath=".\pev.cpp">
|
RelativePath=".\pev.cpp">
|
||||||
<FileConfiguration
|
|
||||||
Name="Debug|Win32">
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"/>
|
|
||||||
</FileConfiguration>
|
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\pev.h">
|
RelativePath=".\pev.h">
|
||||||
|
|
|
@ -10,7 +10,6 @@ void OnAmxxAttach()
|
||||||
MF_AddNatives(forward_natives);
|
MF_AddNatives(forward_natives);
|
||||||
MF_AddNatives(pdata_natives);
|
MF_AddNatives(pdata_natives);
|
||||||
MF_AddNatives(tr_Natives);
|
MF_AddNatives(tr_Natives);
|
||||||
MF_AddNatives(newdllfunc_natives);
|
|
||||||
}
|
}
|
||||||
int GetHullBounds(int hullnumber, float *mins, float *maxs);
|
int GetHullBounds(int hullnumber, float *mins, float *maxs);
|
||||||
// sawce: Do not null out the forward for ServerActivate. It's required for the INDEXENT() fix. (I don't think ServerActivate is planned on being forwarded anyway)
|
// sawce: Do not null out the forward for ServerActivate. It's required for the INDEXENT() fix. (I don't think ServerActivate is planned on being forwarded anyway)
|
||||||
|
|
|
@ -42,7 +42,6 @@ inline edict_t* INDEXENT2( int iEdictNum )
|
||||||
#define CHECK_ENTITY(x) if (x != 0 && (FNullEnt(INDEXENT2(x)) || x < 0 || x > gpGlobals->maxEntities)) { MF_RaiseAmxError(amx,AMX_ERR_NATIVE); return 0; }
|
#define CHECK_ENTITY(x) if (x != 0 && (FNullEnt(INDEXENT2(x)) || x < 0 || x > gpGlobals->maxEntities)) { MF_RaiseAmxError(amx,AMX_ERR_NATIVE); return 0; }
|
||||||
extern AMX_NATIVE_INFO engfunc_natives[];
|
extern AMX_NATIVE_INFO engfunc_natives[];
|
||||||
extern AMX_NATIVE_INFO dllfunc_natives[];
|
extern AMX_NATIVE_INFO dllfunc_natives[];
|
||||||
extern AMX_NATIVE_INFO newdllfunc_natives[];
|
|
||||||
extern AMX_NATIVE_INFO forward_natives[];
|
extern AMX_NATIVE_INFO forward_natives[];
|
||||||
extern AMX_NATIVE_INFO pdata_natives[];
|
extern AMX_NATIVE_INFO pdata_natives[];
|
||||||
extern AMX_NATIVE_INFO tr_Natives[];
|
extern AMX_NATIVE_INFO tr_Natives[];
|
||||||
|
|
|
@ -1,52 +0,0 @@
|
||||||
#include "newdllfunc.h"
|
|
||||||
|
|
||||||
static cell AMX_NATIVE_CALL newdllfunc(AMX *amx,cell *params)
|
|
||||||
{
|
|
||||||
int type;
|
|
||||||
int index;
|
|
||||||
int indexb;
|
|
||||||
//char *temp = "";
|
|
||||||
//char *temp2 = "";
|
|
||||||
//char *temp3 = "";
|
|
||||||
//vec3_t Vec1;
|
|
||||||
//vec3_t Vec2;
|
|
||||||
int iparam1;
|
|
||||||
//int len;
|
|
||||||
cell *cRet;
|
|
||||||
type = params[1];
|
|
||||||
switch(type)
|
|
||||||
{
|
|
||||||
|
|
||||||
/*// pfnGameInit
|
|
||||||
case DLLFunc_GameInit: // void) ( void );
|
|
||||||
gpGamedllFuncs->dllapi_table->pfnGameInit();
|
|
||||||
return 1;
|
|
||||||
*/
|
|
||||||
case NEWDLLFunc_OnFreeEntPrivateData: // void ) ( edict_t *pent );
|
|
||||||
cRet = MF_GetAmxAddr(amx, params[2]);
|
|
||||||
index=cRet[0];
|
|
||||||
CHECK_ENTITY(index);
|
|
||||||
gpGamedllFuncs->newapi_table->pfnOnFreeEntPrivateData(INDEXENT2(index));
|
|
||||||
return 1;
|
|
||||||
case NEWDLLFunc_GameShutdown: // void ) ( void );
|
|
||||||
gpGamedllFuncs->newapi_table->pfnGameShutdown();
|
|
||||||
return 1;
|
|
||||||
case NEWDLLFunc_ShouldCollide: // int ) ( ent1, ent2 );
|
|
||||||
cRet = MF_GetAmxAddr(amx,params[2]);
|
|
||||||
index=cRet[0];
|
|
||||||
CHECK_ENTITY(index);
|
|
||||||
cRet = MF_GetAmxAddr(amx,params[3]);
|
|
||||||
indexb=cRet[0];
|
|
||||||
CHECK_ENTITY(indexb);
|
|
||||||
iparam1 = gpGamedllFuncs->newapi_table->pfnShouldCollide(INDEXENT2(index),INDEXENT2(indexb));
|
|
||||||
return iparam1;
|
|
||||||
default:
|
|
||||||
MF_LogError(amx, AMX_ERR_NATIVE, "Unknown newdllfunc entry %d", type);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
AMX_NATIVE_INFO newdllfunc_natives[] = {
|
|
||||||
{"newdllfunc", newdllfunc},
|
|
||||||
{NULL, NULL},
|
|
||||||
};
|
|
|
@ -1,13 +0,0 @@
|
||||||
#ifndef _NEWDLLFUNC_INCLUDE_H
|
|
||||||
#define _NEWDLLFUNC_INCLUDE_H
|
|
||||||
|
|
||||||
#include "fakemeta_amxx.h"
|
|
||||||
|
|
||||||
enum {
|
|
||||||
NEWDLLFunc_OnFreeEntPrivateData, // void ) (edict_t *pEnt);
|
|
||||||
NEWDLLFunc_GameShutdown, // void ) (void);
|
|
||||||
NEWDLLFunc_ShouldCollide // int ) (edict_t *pentTouched, edict_t *pentOther);
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif //_NEWDLLFUNC_INCLUDE_H
|
|
||||||
|
|
|
@ -38,7 +38,6 @@ native forward_return(type,{Float,Sql,Result,_}:...);
|
||||||
|
|
||||||
native engfunc(type,{Float,Sql,Result,_}:...);
|
native engfunc(type,{Float,Sql,Result,_}:...);
|
||||||
native dllfunc(type,{Float,Sql,Result,_}:...);
|
native dllfunc(type,{Float,Sql,Result,_}:...);
|
||||||
native newdllfunc(type,{Float,Sql,Result,_}:...);
|
|
||||||
|
|
||||||
//only use this with functions that pass a Trace
|
//only use this with functions that pass a Trace
|
||||||
// get: zero extra params - return int, one extra param = byref float or vector
|
// get: zero extra params - return int, one extra param = byref float or vector
|
||||||
|
|
|
@ -155,14 +155,6 @@ enum
|
||||||
DLLFunc_ClientUserInfoChanged // void (idplayer)
|
DLLFunc_ClientUserInfoChanged // void (idplayer)
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Used with newdllfunc()
|
|
||||||
*/
|
|
||||||
enum {
|
|
||||||
NEWDLLFunc_OnFreeEntPrivateData, // void ) (edict_t *pEnt);
|
|
||||||
NEWDLLFunc_GameShutdown, // void ) (void);
|
|
||||||
NEWDLLFunc_ShouldCollide // int ) (edict_t *pentTouched, edict_t *pentOther);
|
|
||||||
};
|
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
pev_string_start = 0,
|
pev_string_start = 0,
|
||||||
pev_classname,
|
pev_classname,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user