diff options
author | XTZGZoReX <none@none> | 2010-08-04 00:24:04 +0200 |
---|---|---|
committer | XTZGZoReX <none@none> | 2010-08-04 00:24:04 +0200 |
commit | a0b5921bfa3cfcd8443313efcccc277dabc2472e (patch) | |
tree | a5c90f230957457f2ac909203b4c4574643c093d | |
parent | 33829ed45eec11d3e3b380b26fca4872e99c8f19 (diff) |
* (Very) minor cleanups.
--HG--
branch : trunk
-rw-r--r-- | src/server/game/PrecompiledHeaders/ScriptPCH.h | 1 | ||||
-rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 11 | ||||
-rw-r--r-- | src/server/game/Scripting/ScriptSystem.h | 6 |
3 files changed, 4 insertions, 14 deletions
diff --git a/src/server/game/PrecompiledHeaders/ScriptPCH.h b/src/server/game/PrecompiledHeaders/ScriptPCH.h index b716edc3a5b..227a5de15ae 100644 --- a/src/server/game/PrecompiledHeaders/ScriptPCH.h +++ b/src/server/game/PrecompiledHeaders/ScriptPCH.h @@ -26,7 +26,6 @@ #ifdef _WIN32 #include <windows.h> - #endif #endif diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index e3a00c835b3..4ce6b403cea 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -153,20 +153,9 @@ class ScriptMgr void CreateSpellScripts(uint32 spell_id, std::vector<std::pair<SpellScript *, SpellScriptsMap::iterator> > & script_vector); }; -//Config file accessors -//std::string GetConfigValueStr(char const* option); -//int32 GetConfigValueInt32(char const* option); -//float GetConfigValueFloat(char const* option); - //Generic scripting text function void DoScriptText(int32 textEntry, WorldObject* pSource, Unit *pTarget = NULL); -#if COMPILER == COMPILER_GNU -#define FUNC_PTR(name,callconvention,returntype,parameters) typedef returntype(*name)parameters __attribute__ ((callconvention)); -#else -#define FUNC_PTR(name, callconvention, returntype, parameters) typedef returntype(callconvention *name)parameters; -#endif - #define sScriptMgr (*ACE_Singleton<ScriptMgr, ACE_Null_Mutex>::instance()) #endif diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h index f78cd2e64fa..7102e4a43e1 100644 --- a/src/server/game/Scripting/ScriptSystem.h +++ b/src/server/game/Scripting/ScriptSystem.h @@ -49,11 +49,10 @@ struct StringTextData uint32 uiEmote; }; -#define pSystemMgr SystemMgr::Instance() - class SystemMgr { public: + SystemMgr(); ~SystemMgr() {} @@ -93,8 +92,11 @@ class SystemMgr } protected: + TextDataMap m_mTextDataMap; //additional data for text strings PointMoveMap m_mPointMoveMap; //coordinates for waypoints }; +#define pSystemMgr SystemMgr::Instance() + #endif |