* (Very) minor cleanups.

--HG--
branch : trunk
This commit is contained in:
XTZGZoReX
2010-08-04 00:24:04 +02:00
parent 33829ed45e
commit a0b5921bfa
3 changed files with 4 additions and 14 deletions

View File

@@ -26,7 +26,6 @@
#ifdef _WIN32
#include <windows.h>
#endif
#endif

View File

@@ -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

View File

@@ -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