UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename some bridge interfaces.

Browse Source
This commit is contained in:
David Anderson 2015-08-30 19:26:33 -07:00
parent 5d55ff23bd
commit 4f1705e001
4 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/logic/common_logic.cpp
View File

@ -59,7 +59,7 @@ SMGlobalClass *SMGlobalClass::head = NULL;
CoreProvider *bridge = nullptr; CoreProvider *bridge = nullptr;
ISourceMod *g_pSM = nullptr; ISourceMod *g_pSM = nullptr;
IVEngineServer *engine = nullptr; IVEngineServerBridge *engine = nullptr;
IdentityToken_t *g_pCoreIdent = nullptr; IdentityToken_t *g_pCoreIdent = nullptr;
ITimerSystem *timersys = nullptr; ITimerSystem *timersys = nullptr;
IGameHelpers *gamehelpers = nullptr; IGameHelpers *gamehelpers = nullptr;

7
core/logic/common_logic.h
View File

@ -42,7 +42,6 @@ extern IHandleSys *handlesys;
extern ISourceMod *g_pSM; extern ISourceMod *g_pSM;
extern ILibrarySys *libsys; extern ILibrarySys *libsys;
extern ITextParsers *textparser; extern ITextParsers *textparser;
extern IVEngineServer *engine;
extern IShareSys *sharesys; extern IShareSys *sharesys;
extern IRootConsole *rootmenu; extern IRootConsole *rootmenu;
extern IPluginManager *pluginsys; extern IPluginManager *pluginsys;
@ -57,5 +56,11 @@ extern IExtensionSys *extsys;
extern ILogger *logger; extern ILogger *logger;
extern IMenuManager *menus; extern IMenuManager *menus;
#if defined SM_LOGIC
extern IVEngineServerBridge *engine;
#else
extern IVEngineServer *engine;
#endif
#endif /* _INCLUDE_SOURCEMOD_COMMON_LOGIC_H_ */ #endif /* _INCLUDE_SOURCEMOD_COMMON_LOGIC_H_ */

20
core/logic/intercom.h
View File

@ -54,15 +54,7 @@ using namespace SourceHook;
*/ */
#define SM_LOGIC_MAGIC (0x0F47C0DE - 48) #define SM_LOGIC_MAGIC (0x0F47C0DE - 48)
#if defined SM_LOGIC class IVEngineServerBridge
# define IVEngineClass IVEngineServer
# define IFileSystemClass IFileSystem
#else
# define IVEngineClass IVEngineServer_Logic
# define IFileSystemClass IFileSystem_Logic
#endif
class IVEngineClass
{ {
public: public:
virtual bool IsDedicatedServer() = 0; virtual bool IsDedicatedServer() = 0;
@ -77,7 +69,7 @@ public:
typedef void * FileHandle_t; typedef void * FileHandle_t;
typedef int FileFindHandle_t; typedef int FileFindHandle_t;
class IFileSystemClass class IFileSystemBridge
{ {
public: public:
virtual const char *FindFirstEx(const char *pWildCard, const char *pPathID, FileFindHandle_t *pHandle) = 0; virtual const char *FindFirstEx(const char *pWildCard, const char *pPathID, FileFindHandle_t *pHandle) = 0;
@ -128,7 +120,7 @@ class KeyValues;
class SMGlobalClass; class SMGlobalClass;
class IPlayerInfo; class IPlayerInfo;
class IPlayerInfo_Logic class IPlayerInfoBridge
{ {
public: public:
virtual bool IsObserver(IPlayerInfo *pInfo) = 0; virtual bool IsObserver(IPlayerInfo *pInfo) = 0;
@ -278,9 +270,9 @@ class CoreProvider
public: public:
/* Objects */ /* Objects */
ISourceMod *sm; ISourceMod *sm;
IVEngineClass *engine; IVEngineServerBridge *engine;
IFileSystemClass *filesystem; IFileSystemBridge *filesystem;
IPlayerInfo_Logic *playerInfo; IPlayerInfoBridge *playerInfo;
ITimerSystem *timersys; ITimerSystem *timersys;
IPlayerManager *playerhelpers; IPlayerManager *playerhelpers;
IGameHelpers *gamehelpers; IGameHelpers *gamehelpers;

6
core/logic_bridge.cpp
View File

@ -89,7 +89,7 @@ IAdminSystem *adminsys = nullptr;
ILogger *logger = nullptr; ILogger *logger = nullptr;
IRootConsole *rootmenu = nullptr; IRootConsole *rootmenu = nullptr;
class VEngineServer_Logic : public IVEngineServer_Logic class VEngineServer_Logic : public IVEngineServerBridge
{ {
public: public:
virtual bool IsDedicatedServer() virtual bool IsDedicatedServer()
@ -130,7 +130,7 @@ public:
} }
} engine_wrapper; } engine_wrapper;
class VFileSystem_Logic : public IFileSystem_Logic class VFileSystem_Logic : public IFileSystemBridge
{ {
public: public:
const char *FindFirstEx(const char *pWildCard, const char *pPathID, FileFindHandle_t *pHandle) const char *FindFirstEx(const char *pWildCard, const char *pPathID, FileFindHandle_t *pHandle)
@ -219,7 +219,7 @@ public:
} }
} fs_wrapper; } fs_wrapper;
class VPlayerInfo_Logic : public IPlayerInfo_Logic class VPlayerInfo_Logic : public IPlayerInfoBridge
{ {
public: public:
bool IsObserver(IPlayerInfo *pInfo) bool IsObserver(IPlayerInfo *pInfo)