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

Build fixes for recent hl2sdk-dota updates.

Browse Source
This commit is contained in:
Nicholas Hastings 2013-04-23 07:11:49 -04:00
parent 39c9e69d8a
commit 369e141ea8
13 changed files with 1121 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/ChatTriggers.cpp
View File

@ -37,23 +37,20 @@
#include "HalfLife2.h" #include "HalfLife2.h"
#include "logic_bridge.h" #include "logic_bridge.h"
/* :HACKHACK: We can't SH_DECL here because ConCmdManager.cpp does. #if SOURCE_ENGINE == SE_DOTA
* While the OB build only runs on MM:S 1.6.0+ (SH 5+), the older one SH_DECL_EXTERN2_void(ConCommand, Dispatch, SH_NOATTRIB, false, void *, const CCommand &);
* can technically be compiled against any MM:S version after 1.4.2. #elif SOURCE_ENGINE >= SE_ORANGEBOX
*/ SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
#if SOURCE_ENGINE >= SE_ORANGEBOX #elif SOURCE_ENGINE == SE_DARKMESSIAH
extern bool __SourceHook_FHRemoveConCommandDispatch(void *, bool, class fastdelegate::FastDelegate1<const CCommand &, void>); SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
extern int __SourceHook_FHAddConCommandDispatch(void *, ISourceHook::AddHookMode, bool, class fastdelegate::FastDelegate1<const CCommand &, void>);
#else #else
extern bool __SourceHook_FHRemoveConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>); # if SH_IMPL_VERSION >= 4
#if SH_IMPL_VERSION >= 5 extern int __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
extern int __SourceHook_FHAddConCommandDispatch(void *, ISourceHook::AddHookMode, bool, class fastdelegate::FastDelegate0<void>); # else
#elif SH_IMPL_VERSION == 4 extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
extern int __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>); # endif
#elif SH_IMPL_VERSION == 3 extern bool __SourceHook_FHRemoveConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
extern bool __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>); #endif
#endif //SH_IMPL_VERSION
#endif //SE_ORANGEBOX
ChatTriggers g_ChatTriggers; ChatTriggers g_ChatTriggers;
bool g_bSupressSilentFails = false; bool g_bSupressSilentFails = false;
@ -150,7 +147,10 @@ void ChatTriggers::OnSourceModShutdown()
g_Forwards.ReleaseForward(m_pDidFloodBlock); g_Forwards.ReleaseForward(m_pDidFloodBlock);
} }
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
void ChatTriggers::OnSayCommand_Pre(void *pUnknown, const CCommand &command)
{
#elif SOURCE_ENGINE >= SE_ORANGEBOX
void ChatTriggers::OnSayCommand_Pre(const CCommand &command) void ChatTriggers::OnSayCommand_Pre(const CCommand &command)
{ {
#else #else
@ -267,7 +267,9 @@ void ChatTriggers::OnSayCommand_Pre()
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
void ChatTriggers::OnSayCommand_Post(void *pUnknown, const CCommand &command)
#elif SOURCE_ENGINE >= SE_ORANGEBOX
void ChatTriggers::OnSayCommand_Post(const CCommand &command) void ChatTriggers::OnSayCommand_Post(const CCommand &command)
#else #else
void ChatTriggers::OnSayCommand_Post() void ChatTriggers::OnSayCommand_Post()

5
core/ChatTriggers.h
View File

@ -54,7 +54,10 @@ public: //SMGlobalClass
char *error, char *error,
size_t maxlength); size_t maxlength);
private: //ConCommand private: //ConCommand
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
void OnSayCommand_Pre(void *pUnknown, const CCommand &command);
void OnSayCommand_Post(void *pUnknown, const CCommand &command);
#elif SOURCE_ENGINE >= SE_ORANGEBOX
void OnSayCommand_Pre(const CCommand &command); void OnSayCommand_Pre(const CCommand &command);
void OnSayCommand_Post(const CCommand &command); void OnSayCommand_Post(const CCommand &command);
#else #else

9
core/ConCmdManager.cpp
View File

@ -40,7 +40,9 @@
ConCmdManager g_ConCmds; ConCmdManager g_ConCmds;
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
SH_DECL_HOOK2_void(ConCommand, Dispatch, SH_NOATTRIB, false, void *, const CCommand &);
#elif SOURCE_ENGINE >= SE_ORANGEBOX
SH_DECL_HOOK1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &); SH_DECL_HOOK1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
#else #else
SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false); SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
@ -206,7 +208,10 @@ void ConCmdManager::OnPluginDestroyed(IPlugin *plugin)
delete pList; delete pList;
} }
} }
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
void CommandCallback(void *pUnknown, const CCommand &command)
{
#elif SOURCE_ENGINE >= SE_ORANGEBOX
void CommandCallback(const CCommand &command) void CommandCallback(const CCommand &command)
{ {
#else #else

4
core/ConCmdManager.h
View File

@ -98,7 +98,9 @@ class ConCmdManager :
public IPluginsListener, public IPluginsListener,
public IConCommandTracker public IConCommandTracker
{ {
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
friend void CommandCallback(void *pUnknown, const CCommand &command);
#elif SOURCE_ENGINE >= SE_ORANGEBOX
friend void CommandCallback(const CCommand &command); friend void CommandCallback(const CCommand &command);
#else #else
friend void CommandCallback(); friend void CommandCallback();

8
core/ConsoleDetours.cpp
View File

@ -59,7 +59,9 @@
#endif #endif
#if SH_IMPL_VERSION >= 5 #if SH_IMPL_VERSION >= 5
# if SOURCE_ENGINE >= SE_ORANGEBOX # if SOURCE_ENGINE == SE_DOTA
SH_DECL_EXTERN2_void(ConCommand, Dispatch, SH_NOATTRIB, false, void *, const CCommand &);
# elif SOURCE_ENGINE >= SE_ORANGEBOX
SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &); SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
# else # else
SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false); SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
@ -131,7 +133,9 @@ class GenericCommandHooker : public IConCommandLinkListener
} }
} }
# if SOURCE_ENGINE >= SE_ORANGEBOX # if SOURCE_ENGINE == SE_DOTA
void Dispatch(void *pUnknown, const CCommand& args)
# elif SOURCE_ENGINE >= SE_ORANGEBOX
void Dispatch(const CCommand& args) void Dispatch(const CCommand& args)
# else # else
void Dispatch() void Dispatch()

9
core/CoreConfig.cpp
View File

@ -61,7 +61,10 @@ ConVar *g_ServerCfgFile = NULL;
void CheckAndFinalizeConfigs(); void CheckAndFinalizeConfigs();
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
SH_DECL_EXTERN2_void(ConCommand, Dispatch, SH_NOATTRIB, false, void *, const CCommand &);
void Hook_ExecDispatchPre(void *pUnknown, const CCommand &cmd)
#elif SOURCE_ENGINE >= SE_ORANGEBOX
SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &); SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
void Hook_ExecDispatchPre(const CCommand &cmd) void Hook_ExecDispatchPre(const CCommand &cmd)
#elif SOURCE_ENGINE == SE_DARKMESSIAH #elif SOURCE_ENGINE == SE_DARKMESSIAH
@ -89,7 +92,9 @@ void Hook_ExecDispatchPre()
} }
} }
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
void Hook_ExecDispatchPost(void *pUnknown, const CCommand &cmd)
#elif SOURCE_ENGINE >= SE_ORANGEBOX
void Hook_ExecDispatchPost(const CCommand &cmd) void Hook_ExecDispatchPost(const CCommand &cmd)
#else #else
void Hook_ExecDispatchPost() void Hook_ExecDispatchPost()

9
core/NextMap.cpp
View File

@ -45,7 +45,9 @@ SH_DECL_HOOK2_void(IVEngineServer, ChangeLevel, SH_NOATTRIB, 0, const char *, co
SH_DECL_HOOK4_void(IVEngineServer, ChangeLevel, SH_NOATTRIB, 0, const char *, const char *, const char *, bool); SH_DECL_HOOK4_void(IVEngineServer, ChangeLevel, SH_NOATTRIB, 0, const char *, const char *, const char *, bool);
#endif #endif
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
SH_DECL_EXTERN2_void(ConCommand, Dispatch, SH_NOATTRIB, false, void *, const CCommand &);
#elif SOURCE_ENGINE >= SE_ORANGEBOX
SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &); SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
#elif SOURCE_ENGINE == SE_DARKMESSIAH #elif SOURCE_ENGINE == SE_DARKMESSIAH
SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false); SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
@ -205,7 +207,10 @@ NextMapManager::NextMapManager()
m_mapHistory = SourceHook::List<MapChangeData *>(); m_mapHistory = SourceHook::List<MapChangeData *>();
} }
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
void CmdChangeLevelCallback(void *pUnknown, const CCommand &command)
{
#elif SOURCE_ENGINE >= SE_ORANGEBOX
void CmdChangeLevelCallback(const CCommand &command) void CmdChangeLevelCallback(const CCommand &command)
{ {
#else #else

8
core/NextMap.h
View File

@ -58,7 +58,9 @@ struct MapChangeData
time_t startTime; time_t startTime;
}; };
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
void CmdChangeLevelCallback(void *pUnknown, const CCommand &command);
#elif SOURCE_ENGINE >= SE_ORANGEBOX
void CmdChangeLevelCallback(const CCommand &command); void CmdChangeLevelCallback(const CCommand &command);
#else #else
void CmdChangeLevelCallback(); void CmdChangeLevelCallback();
@ -69,7 +71,9 @@ class NextMapManager : public SMGlobalClass
public: public:
NextMapManager(); NextMapManager();
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
friend void CmdChangeLevelCallback(void *pUnknown, const CCommand &command);
#elif SOURCE_ENGINE >= SE_ORANGEBOX
friend void CmdChangeLevelCallback(const CCommand &command); friend void CmdChangeLevelCallback(const CCommand &command);
#else #else
friend void CmdChangeLevelCallback(); friend void CmdChangeLevelCallback();

9
core/PlayerManager.cpp
View File

@ -69,7 +69,9 @@ SH_DECL_HOOK1_void(IServerGameClients, ClientCommand, SH_NOATTRIB, 0, edict_t *)
SH_DECL_HOOK1_void(IServerGameClients, ClientSettingsChanged, SH_NOATTRIB, 0, edict_t *); SH_DECL_HOOK1_void(IServerGameClients, ClientSettingsChanged, SH_NOATTRIB, 0, edict_t *);
SH_DECL_HOOK3_void(IServerGameDLL, ServerActivate, SH_NOATTRIB, 0, edict_t *, int, int); SH_DECL_HOOK3_void(IServerGameDLL, ServerActivate, SH_NOATTRIB, 0, edict_t *, int, int);
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
SH_DECL_EXTERN2_void(ConCommand, Dispatch, SH_NOATTRIB, false, void *, const CCommand &);
#elif SOURCE_ENGINE >= SE_ORANGEBOX
SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &); SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
#elif SOURCE_ENGINE == SE_DARKMESSIAH #elif SOURCE_ENGINE == SE_DARKMESSIAH
SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false); SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
@ -1711,7 +1713,10 @@ int PlayerManager::GetClientFromSerial(unsigned int serial)
return 0; return 0;
} }
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
void CmdMaxplayersCallback(void *pUnknown, const CCommand &command)
{
#elif SOURCE_ENGINE >= SE_ORANGEBOX
void CmdMaxplayersCallback(const CCommand &command) void CmdMaxplayersCallback(const CCommand &command)
{ {
#else #else

4
core/PlayerManager.h
View File

@ -230,7 +230,9 @@ private:
int m_ReplayUserId; int m_ReplayUserId;
}; };
#if SOURCE_ENGINE >= SE_ORANGEBOX #if SOURCE_ENGINE == SE_DOTA
void CmdMaxplayersCallback(void *, const CCommand &command);
#elif SOURCE_ENGINE >= SE_ORANGEBOX
void CmdMaxplayersCallback(const CCommand &command); void CmdMaxplayersCallback(const CCommand &command);
#else #else
void CmdMaxplayersCallback(); void CmdMaxplayersCallback();

1045
core/convar_sm_dota.h Normal file
View File

File diff suppressed because it is too large Load Diff

4
core/logic_bridge.cpp
View File

@ -46,7 +46,9 @@
#include "AdminCache.h" #include "AdminCache.h"
#include "HalfLife2.h" #include "HalfLife2.h"
#include "CoreConfig.h" #include "CoreConfig.h"
#if SOURCE_ENGINE >= SE_ALIENSWARM #if SOURCE_ENGINE == SE_DOTA
#include "convar_sm_dota.h"
#elif SOURCE_ENGINE >= SE_ALIENSWARM
#include "convar_sm_swarm.h" #include "convar_sm_swarm.h"
#elif SOURCE_ENGINE >= SE_LEFT4DEAD #elif SOURCE_ENGINE >= SE_LEFT4DEAD
#include "convar_sm_l4d.h" #include "convar_sm_l4d.h"

4
core/sourcemm_api.h
View File

@ -32,7 +32,9 @@
#ifndef _INCLUDE_SOURCEMOD_MM_API_H_ #ifndef _INCLUDE_SOURCEMOD_MM_API_H_
#define _INCLUDE_SOURCEMOD_MM_API_H_ #define _INCLUDE_SOURCEMOD_MM_API_H_
#if SOURCE_ENGINE >= SE_ALIENSWARM #if SOURCE_ENGINE == SE_DOTA
#include "convar_sm_dota.h"
#elif SOURCE_ENGINE >= SE_ALIENSWARM
#include "convar_sm_swarm.h" #include "convar_sm_swarm.h"
#elif SOURCE_ENGINE >= SE_LEFT4DEAD #elif SOURCE_ENGINE >= SE_LEFT4DEAD
#include "convar_sm_l4d.h" #include "convar_sm_l4d.h"