diff --git a/dlls/fakemeta/fakemeta.vcproj b/dlls/fakemeta/fakemeta.vcproj index b461d6cf..b731bd06 100755 --- a/dlls/fakemeta/fakemeta.vcproj +++ b/dlls/fakemeta/fakemeta.vcproj @@ -161,23 +161,12 @@ - - - - - - - diff --git a/dlls/fakemeta/fakemeta_amxx.cpp b/dlls/fakemeta/fakemeta_amxx.cpp index 91cf05bf..5da36ea1 100755 --- a/dlls/fakemeta/fakemeta_amxx.cpp +++ b/dlls/fakemeta/fakemeta_amxx.cpp @@ -10,7 +10,6 @@ void OnAmxxAttach() MF_AddNatives(forward_natives); MF_AddNatives(pdata_natives); MF_AddNatives(tr_Natives); - MF_AddNatives(newdllfunc_natives); } 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) diff --git a/dlls/fakemeta/fakemeta_amxx.h b/dlls/fakemeta/fakemeta_amxx.h index e44d89f1..0634c568 100755 --- a/dlls/fakemeta/fakemeta_amxx.h +++ b/dlls/fakemeta/fakemeta_amxx.h @@ -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; } extern AMX_NATIVE_INFO engfunc_natives[]; extern AMX_NATIVE_INFO dllfunc_natives[]; -extern AMX_NATIVE_INFO newdllfunc_natives[]; extern AMX_NATIVE_INFO forward_natives[]; extern AMX_NATIVE_INFO pdata_natives[]; extern AMX_NATIVE_INFO tr_Natives[]; diff --git a/dlls/fakemeta/newdllfunc.cpp b/dlls/fakemeta/newdllfunc.cpp deleted file mode 100755 index bfe3c123..00000000 --- a/dlls/fakemeta/newdllfunc.cpp +++ /dev/null @@ -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}, -}; \ No newline at end of file diff --git a/dlls/fakemeta/newdllfunc.h b/dlls/fakemeta/newdllfunc.h deleted file mode 100755 index a103c87d..00000000 --- a/dlls/fakemeta/newdllfunc.h +++ /dev/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 - diff --git a/plugins/include/fakemeta.inc b/plugins/include/fakemeta.inc index 91f10074..29509962 100755 --- a/plugins/include/fakemeta.inc +++ b/plugins/include/fakemeta.inc @@ -38,7 +38,6 @@ native forward_return(type,{Float,Sql,Result,_}:...); native engfunc(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 // get: zero extra params - return int, one extra param = byref float or vector diff --git a/plugins/include/fakemeta_const.inc b/plugins/include/fakemeta_const.inc index 346e7ba9..f466dbba 100755 --- a/plugins/include/fakemeta_const.inc +++ b/plugins/include/fakemeta_const.inc @@ -155,14 +155,6 @@ enum 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 { pev_string_start = 0, pev_classname,