mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[c12589] Use proper error files for missing string errors

Browse source
This commit is contained in:
Schmoozerd 2013-05-31 10:43:25 +01:00 • committed by Antz
parent 39262d4e6a
commit 58ad20df80
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/ObjectMgr.cpp
View file

@ -7742,9 +7742,9 @@ const char* ObjectMgr::GetMangosString(int32 entry, int locale_idx) const
else if (entry > 0) else if (entry > 0)
sLog.outErrorDb("Entry %i not found in `mangos_string` table.", entry); sLog.outErrorDb("Entry %i not found in `mangos_string` table.", entry);
else if (entry > MAX_CREATURE_AI_TEXT_STRING_ID) else if (entry > MAX_CREATURE_AI_TEXT_STRING_ID)
sLog.outErrorDb("Entry %i not found in `creature_ai_texts` table.", entry); sLog.outErrorEventAI("Entry %i not found in `creature_ai_texts` table.", entry);
else else
sLog.outErrorDb("Mangos string entry %i not found in DB.", entry); sLog.outErrorScriptLib("String entry %i not found in Database.", entry);
return "<error>"; return "<error>";
} }

1
src/game/ObjectMgr.h
View file

@ -121,6 +121,7 @@ typedef UNORDERED_MAP < uint32/*(mapid,spawnMode) pair*/, CellObjectGuidsMap > M
#define MAX_DB_SCRIPT_STRING_ID 2000010000 #define MAX_DB_SCRIPT_STRING_ID 2000010000
#define MIN_CREATURE_AI_TEXT_STRING_ID (-1) // 'creature_ai_texts' #define MIN_CREATURE_AI_TEXT_STRING_ID (-1) // 'creature_ai_texts'
#define MAX_CREATURE_AI_TEXT_STRING_ID (-1000000) #define MAX_CREATURE_AI_TEXT_STRING_ID (-1000000)
// Anything below MAX_CREATURE_AI_TEXT_STRING_ID is handled by the external script lib
static_assert(MAX_DB_SCRIPT_STRING_ID < ACE_INT32_MAX, "Must scope with int32 range"); static_assert(MAX_DB_SCRIPT_STRING_ID < ACE_INT32_MAX, "Must scope with int32 range");

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12588" #define REVISION_NR "12589"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__