Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consistency: Replace GETEDICT with HLTypeConversion in core

Browse Source
This commit is contained in:
Arkshine 2015-10-07 22:31:01 +02:00
parent b65a0600ee
commit 9bee1f7edf
7 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amxmodx/amxmodx.cpp
View File

@ -83,7 +83,7 @@ static cell AMX_NATIVE_CALL emit_sound(AMX *amx, cell *params) /* 7 param */
EMIT_SOUND_DYN2(pPlayer->pEdict, channel, szSample, vol, att, flags, pitch); EMIT_SOUND_DYN2(pPlayer->pEdict, channel, szSample, vol, att, flags, pitch);
} }
} else { } else {
edict_t* pEdict = GETEDICT(params[1]); edict_t* pEdict = TypeConversion.id_to_edict(params[1]);
if (!FNullEnt(pEdict)) if (!FNullEnt(pEdict))
EMIT_SOUND_DYN2(pEdict, channel, szSample, vol, att, flags, pitch); EMIT_SOUND_DYN2(pEdict, channel, szSample, vol, att, flags, pitch);

3
amxmodx/amxmodx.h
View File

@ -52,6 +52,7 @@
#include "CvarManager.h" #include "CvarManager.h"
#include "CoreConfig.h" #include "CoreConfig.h"
#include <amxmodx_version.h> #include <amxmodx_version.h>
#include <HLTypeConversion.h>
#define AMXXLOG_Log g_log.Log #define AMXXLOG_Log g_log.Log
#define AMXXLOG_Error g_log.LogError #define AMXXLOG_Error g_log.LogError
@ -145,7 +146,6 @@ void UTIL_TrimRight(char *buffer);
#define GET_PLAYER_POINTER(e) (&g_players[ENTINDEX(e)]) #define GET_PLAYER_POINTER(e) (&g_players[ENTINDEX(e)])
//#define GET_PLAYER_POINTER(e) (&g_players[(((int)e-g_edict_point)/sizeof(edict_t))]) //#define GET_PLAYER_POINTER(e) (&g_players[(((int)e-g_edict_point)/sizeof(edict_t))])
#define GET_PLAYER_POINTER_I(i) (&g_players[i]) #define GET_PLAYER_POINTER_I(i) (&g_players[i])
#define GETEDICT(n) ((n >= 1 && n <= gpGlobals->maxClients) ? GET_PLAYER_POINTER_I(n)->pEdict : INDEXENT(n))
struct WeaponsVault struct WeaponsVault
{ {
@ -369,5 +369,6 @@ enum PrintColor
}; };
extern enginefuncs_t *g_pEngTable; extern enginefuncs_t *g_pEngTable;
extern HLTypeConversion TypeConversion;
#endif // AMXMODX_H #endif // AMXMODX_H

4
amxmodx/messages.cpp
View File

@ -423,7 +423,7 @@ static cell _message_begin(AMX *amx, cell *params, bool useFloat) /* 4 param */
return 0; return 0;
} }
MESSAGE_BEGIN(params[1], params[2], NULL, GETEDICT(params[4])); MESSAGE_BEGIN(params[1], params[2], NULL, TypeConversion.id_to_edict(params[4]));
break; break;
} }
@ -771,7 +771,7 @@ static cell _emessage_begin(AMX *amx, cell *params, bool useFloat)
return 0; return 0;
} }
g_pEngTable->pfnMessageBegin(params[1], params[2], NULL, GETEDICT(params[4])); g_pEngTable->pfnMessageBegin(params[1], params[2], NULL, TypeConversion.id_to_edict(params[4]));
break; break;
} }

3
amxmodx/meta_api.cpp
View File

@ -147,6 +147,7 @@ int FF_ClientAuthorized = -1;
int FF_ChangeLevel = -1; int FF_ChangeLevel = -1;
IFileSystem* g_FileSystem; IFileSystem* g_FileSystem;
HLTypeConversion TypeConversion;
bool ColoredMenus(const char *ModName) bool ColoredMenus(const char *ModName)
{ {
@ -518,6 +519,8 @@ int C_Spawn(edict_t *pent)
modules_callPluginsLoaded(); modules_callPluginsLoaded();
TypeConversion.init();
// ###### Call precache forward function // ###### Call precache forward function
g_dontprecache = false; g_dontprecache = false;
executeForwards(FF_PluginPrecache); executeForwards(FF_PluginPrecache);

2
amxmodx/vector.cpp
View File

@ -63,7 +63,7 @@ static cell AMX_NATIVE_CALL VelocityByAim(AMX *amx, cell *params)
} }
pEnt = GET_PLAYER_POINTER_I(iEnt)->pEdict; pEnt = GET_PLAYER_POINTER_I(iEnt)->pEdict;
} else { } else {
pEnt = INDEXENT(iEnt); pEnt = TypeConversion.id_to_edict(iEnt);
} }
} }

2
modules/fakemeta/misc.cpp
View File

@ -47,7 +47,7 @@ static cell AMX_NATIVE_CALL lookup_sequence(AMX* amx, cell* params)
for (int i = 0; i < pstudiohdr->numseq; i++) for (int i = 0; i < pstudiohdr->numseq; i++)
{ {
if (stricmp( pseqdesc[i].label, label ) == 0) if (strcasecmp( pseqdesc[i].label, label ) == 0)
{ {
REAL* FrameRate = reinterpret_cast<REAL*>(MF_GetAmxAddr(amx, params[3])); REAL* FrameRate = reinterpret_cast<REAL*>(MF_GetAmxAddr(amx, params[3]));
cell* Loops = MF_GetAmxAddr(amx, params[4]); cell* Loops = MF_GetAmxAddr(amx, params[4]);

5
public/HLTypeConversion.h
View File

@ -9,8 +9,9 @@
#ifndef _HL_CONVERSION_TYPE_H_ #ifndef _HL_CONVERSION_TYPE_H_
#define _HL_CONVERSION_TYPE_H_ #define _HL_CONVERSION_TYPE_H_
#include <stddef.h> // size_t #include <stddef.h> // size_t
#include <extdll.h> // edict_t, etc. #include <extdll.h> // edict_t, etc.
#include <sdk_util.h> // FNullEnt, INDEXENT, etc.
template <typename T> static inline T& ref_pdata(void *pPrivateData, int offset, int element = 0) template <typename T> static inline T& ref_pdata(void *pPrivateData, int offset, int element = 0)
{ {