A great purge of obsolete macros.
--HG-- branch : trunk
This commit is contained in:
+12
-12
@@ -140,8 +140,8 @@ typedef UNORDERED_MAP<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapOb
|
||||
|
||||
typedef UNORDERED_MAP<uint64/*(instance,guid) pair*/,time_t> RespawnTimes;
|
||||
|
||||
// mangos string ranges
|
||||
#define MIN_TRINITY_STRING_ID 1 // 'mangos_string'
|
||||
// Trinity string ranges
|
||||
#define MIN_TRINITY_STRING_ID 1 // 'trinity_string'
|
||||
#define MAX_TRINITY_STRING_ID 2000000000
|
||||
#define MIN_DB_SCRIPT_STRING_ID MAX_TRINITY_STRING_ID // 'db_script_string'
|
||||
#define MAX_DB_SCRIPT_STRING_ID 2000010000
|
||||
@@ -348,7 +348,7 @@ SkillRangeType GetSkillRangeType(SkillLineEntry const *pSkill, bool racial);
|
||||
|
||||
bool normalizePlayerName(std::string& name);
|
||||
|
||||
struct TRINITY_DLL_SPEC LanguageDesc
|
||||
struct LanguageDesc
|
||||
{
|
||||
Language lang_id;
|
||||
uint32 spell_id;
|
||||
@@ -356,7 +356,7 @@ struct TRINITY_DLL_SPEC LanguageDesc
|
||||
};
|
||||
|
||||
extern LanguageDesc lang_description[LANGUAGES_COUNT];
|
||||
TRINITY_DLL_SPEC LanguageDesc const* GetLanguageDescByID(uint32 lang);
|
||||
LanguageDesc const* GetLanguageDescByID(uint32 lang);
|
||||
|
||||
class PlayerDumpReader;
|
||||
|
||||
@@ -1075,13 +1075,13 @@ class ObjectMgr
|
||||
#define objmgr Trinity::Singleton<ObjectMgr>::Instance()
|
||||
|
||||
// scripting access functions
|
||||
TRINITY_DLL_SPEC bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min());
|
||||
TRINITY_DLL_SPEC uint32 GetAreaTriggerScriptId(uint32 trigger_id);
|
||||
TRINITY_DLL_SPEC uint32 GetScriptId(const char *name);
|
||||
TRINITY_DLL_SPEC ObjectMgr::ScriptNameMap& GetScriptNames();
|
||||
TRINITY_DLL_SPEC GameObjectInfo const *GetGameObjectInfo(uint32 id);
|
||||
TRINITY_DLL_SPEC CreatureInfo const *GetCreatureInfo(uint32 id);
|
||||
TRINITY_DLL_SPEC CreatureInfo const* GetCreatureTemplateStore(uint32 entry);
|
||||
TRINITY_DLL_SPEC Quest const* GetQuestTemplateStore(uint32 entry);
|
||||
bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min());
|
||||
uint32 GetAreaTriggerScriptId(uint32 trigger_id);
|
||||
uint32 GetScriptId(const char *name);
|
||||
ObjectMgr::ScriptNameMap& GetScriptNames();
|
||||
GameObjectInfo const *GetGameObjectInfo(uint32 id);
|
||||
CreatureInfo const *GetCreatureInfo(uint32 id);
|
||||
CreatureInfo const* GetCreatureTemplateStore(uint32 entry);
|
||||
Quest const* GetQuestTemplateStore(uint32 entry);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user