From 40ca5f8002169fadb74dbf1ace856a51ad985c62 Mon Sep 17 00:00:00 2001 From: Twilight Suzuka Date: Sat, 17 Dec 2005 02:16:01 +0000 Subject: [PATCH] *** empty log message *** --- dlls/ts/tsfun/amxxmodule.cpp | 14 ++++---------- dlls/ts/tsfun/amxxmodule.h | 30 ------------------------------ dlls/ts/tsfun/tsfun.cpp | 8 ++++---- dlls/ts/tsfun/tsfun.h | 4 ++-- 4 files changed, 10 insertions(+), 46 deletions(-) diff --git a/dlls/ts/tsfun/amxxmodule.cpp b/dlls/ts/tsfun/amxxmodule.cpp index 7355cded..e374e441 100755 --- a/dlls/ts/tsfun/amxxmodule.cpp +++ b/dlls/ts/tsfun/amxxmodule.cpp @@ -2502,8 +2502,6 @@ PFN_FORMAT g_fn_Format; PFN_REGISTERFUNCTION g_fn_RegisterFunction; PFN_REQ_FNPTR g_fn_RequestFunction; PFN_AMX_PUSH g_fn_AmxPush; -PFN_SET_TEAM_INFO g_fn_SetTeamInfo; -PFN_PLAYER_PROP_ADDR g_fn_PlayerPropAddr; // *** Exports *** C_DLLEXPORT int AMXX_Query(int *interfaceVersion, amxx_module_info_s *moduleInfo) @@ -2613,8 +2611,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc) REQFUNC("GetPlayerFlags", g_fn_GetPlayerFlags, PFN_GETPLAYERFLAGS); REQFUNC("GetPlayerEdict", g_fn_GetPlayerEdict, PFN_GET_PLAYER_EDICT); REQFUNC("amx_Push", g_fn_AmxPush, PFN_AMX_PUSH); - REQFUNC("SetPlayerTeamInfo", g_fn_SetTeamInfo, PFN_SET_TEAM_INFO); - REQFUNC("PlayerPropAddr", g_fn_PlayerPropAddr, PFN_PLAYER_PROP_ADDR); #ifdef MEMORY_TEST // Memory @@ -2737,8 +2733,6 @@ void ValidateMacros_DontCallThis_Smiley() MF_GetPlayerEdict(0); MF_Format("", 4, "str"); MF_RegisterFunction(NULL, ""); - MF_SetPlayerTeamInfo(0, 0, ""); - MF_PlayerPropAddr(0, 0); } #endif @@ -2918,20 +2912,20 @@ void operator delete[](void *reportedAddress) #else #if !defined NO_ALLOC_OVERRIDES && !defined MEMORY_TEST && !defined WIN32 -void * operator new(size_t size) { +void * ::operator new(size_t size) { return(calloc(1, size)); } -void * operator new[](size_t size) { +void * ::operator new[](size_t size) { return(calloc(1, size)); } -void operator delete(void * ptr) { +void ::operator delete(void * ptr) { if(ptr) free(ptr); } -void operator delete[](void * ptr) { +void ::operator delete[](void * ptr) { if(ptr) free(ptr); } diff --git a/dlls/ts/tsfun/amxxmodule.h b/dlls/ts/tsfun/amxxmodule.h index 85f7985d..0a000d20 100755 --- a/dlls/ts/tsfun/amxxmodule.h +++ b/dlls/ts/tsfun/amxxmodule.h @@ -1927,28 +1927,6 @@ enum ForwardParam FP_ARRAY, // array; use the return value of prepareArray. }; -enum PlayerProp -{ - Player_Name, //String - Player_Ip, //String - Player_Team, //String - Player_Ingame, //bool - Player_Authorized, //bool - Player_Vgui, //bool - Player_Time, //float - Player_Playtime, //float - Player_MenuExpire, //float - Player_Weapons, //struct{int,int}[32] - Player_CurrentWeapon, //int - Player_TeamID, //int - Player_Deaths, //int - Player_Aiming, //int - Player_Menu, //int - Player_Keys, //int - Player_Flags, //int[32] - Player_Newmenu, //int - Player_NewmenuPage, //int -}; typedef int (*PFN_ADD_NATIVES) (const AMX_NATIVE_INFO * /*list*/); typedef char * (*PFN_BUILD_PATHNAME) (const char * /*format*/, ...); @@ -2000,7 +1978,6 @@ typedef edict_t * (*PFN_GET_PLAYER_EDICT) (int /*id*/); #else typedef void * (*PFN_GET_PLAYER_EDICT) (int /*id*/); #endif -typedef void * (*PFN_PLAYER_PROP_ADDR) (int /*id*/, int /*prop*/); #ifdef MEMORY_TEST typedef void * (*PFN_ALLOCATOR) (const char* /*filename*/, const unsigned int /*line*/, const char* /*func*/, @@ -2026,7 +2003,6 @@ typedef void (*PFN_MERGEDEFINITION_FILE) (const char * /*filename*/); typedef const char * (*PFN_FORMAT) (const char * /*fmt*/, ... /*params*/); typedef void (*PFN_REGISTERFUNCTION) (void * /*pfn*/, const char * /*desc*/); typedef int (*PFN_AMX_PUSH) (AMX * /*amx*/, cell /*value*/); -typedef int (*PFN_SET_TEAM_INFO) (int /*player */, int /*teamid */, const char */*name */); extern PFN_ADD_NATIVES g_fn_AddNatives; extern PFN_BUILD_PATHNAME g_fn_BuildPathname; @@ -2090,8 +2066,6 @@ extern PFN_GET_PLAYER_TEAM g_fn_GetPlayerTeam; extern PFN_REGISTERFUNCTION g_fn_RegisterFunction; extern PFN_REQ_FNPTR g_fn_RequestFunction; extern PFN_AMX_PUSH g_fn_AmxPush; -extern PFN_SET_TEAM_INFO g_fn_SetTeamInfo; -extern PFN_PLAYER_PROP_ADDR g_fn_PlayerPropAddr; #ifdef MAY_NEVER_BE_DEFINED // Function prototypes for intellisense and similar systems @@ -2152,8 +2126,6 @@ void MF_RegisterFunction (void *pfn, const char *description) { } void * MF_RequestFunction (const char *description) { } int MF_AmxPush (AMX *amx, cell *params) { } int MF_AmxExec (AMX *amx, cell *retval, int idx) { } -int MF_SetPlayerTeamInfo (int id, int teamid, const char *teamname) { } -void * MF_PlayerPropAddr (int id, int prop) { } #endif // MAY_NEVER_BE_DEFINED #define MF_AddNatives g_fn_AddNatives @@ -2219,8 +2191,6 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...); #define MF_RegisterFunction g_fn_RegisterFunction #define MF_RequestFunction g_fn_RequestFunction; #define MF_AmxPush g_fn_AmxPush -#define MF_SetPlayerTeamInfo g_fn_SetTeamInfo -#define MF_PlayerPropAddr g_fn_PlayerPropAddr #ifdef MEMORY_TEST /*** Memory ***/ diff --git a/dlls/ts/tsfun/tsfun.cpp b/dlls/ts/tsfun/tsfun.cpp index 4db4eb97..7f6f8dd8 100755 --- a/dlls/ts/tsfun/tsfun.cpp +++ b/dlls/ts/tsfun/tsfun.cpp @@ -84,8 +84,8 @@ const char* get_localinfo( const char* name , const char* def = 0 ) int Powerup = -1; int KungFoo = -1; //-1 is an invalid forward so initiate this to that -int Death = -1; -int Damage = -1; +//int Death = -1; +//int Damage = -1; int Stunt = -1; void OnPluginsLoaded() @@ -96,8 +96,8 @@ void OnPluginsLoaded() //FP_CELL - second parameter is a normal cell //FP_DONE - that's the end of the parameter descriptions KungFoo = MF_RegisterForward("Melee_Attack", ET_STOP, FP_CELL, FP_FLOAT,FP_FLOAT, FP_DONE); - Death = MF_RegisterForward("client_death", ET_IGNORE, FP_CELL,FP_CELL,FP_CELL,FP_CELL,FP_CELL, FP_DONE); - Damage = MF_RegisterForward("client_damage", ET_IGNORE, FP_CELL,FP_CELL,FP_CELL,FP_CELL,FP_CELL, FP_DONE); + //Death = MF_RegisterForward("client_death", ET_IGNORE, FP_CELL,FP_CELL,FP_CELL,FP_CELL,FP_CELL, FP_DONE); + //Damage = MF_RegisterForward("client_damage", ET_IGNORE, FP_CELL,FP_CELL,FP_CELL,FP_CELL,FP_CELL, FP_DONE); Powerup = MF_RegisterForward("client_powerup", ET_IGNORE, FP_CELL, FP_CELL, FP_DONE); Stunt = MF_RegisterForward("client_stunt", ET_IGNORE, FP_CELL, FP_CELL, FP_DONE); } diff --git a/dlls/ts/tsfun/tsfun.h b/dlls/ts/tsfun/tsfun.h index 77e18526..06ed63e0 100755 --- a/dlls/ts/tsfun/tsfun.h +++ b/dlls/ts/tsfun/tsfun.h @@ -40,8 +40,8 @@ #define STUNT_GETUP 4 #define STUNT_FLIP 5 -extern int Death; -extern int Damage; +//extern int Death; +//extern int Damage; #define GET_PLAYER_POINTER(e) (&players[ENTINDEX(e)]) #define GET_PLAYER_POINTER_I(i) (&players[i])