From bfa9e7516177af9e13391a09d4e1356c74a4c2ba Mon Sep 17 00:00:00 2001 From: visagalis Date: Fri, 14 Nov 2008 17:03:03 -0600 Subject: [svn] *** Source: MaNGOS *** * Implement localization of creature/gameobject name that say/yell. Author: evilstar (rewrited by: Vladimir) * Fix auth login queue. Author: Derex * Allowed switching INVTYPE_HOLDABLE items during combat, used correct spells for triggering global cooldown at weapon switch. Author: mobel/simak * Fixed some format arg type/value pairs. Other warnings. Author: Vladimir * [238_world.sql] Allow have team dependent graveyards at entrance map for instances. Author: Vladimir NOTE: Entrance map graveyards selected by same way as local (by distance from entrance) Until DB support will work in old way base at current DB data. --HG-- branch : trunk --- src/shared/Database/DBCStructure.h | 6 +++--- src/shared/Database/DBCfmt.cpp | 2 +- src/shared/Database/SqlOperations.cpp | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/shared') diff --git a/src/shared/Database/DBCStructure.h b/src/shared/Database/DBCStructure.h index 6f3bb63835f..b57b031ef55 100644 --- a/src/shared/Database/DBCStructure.h +++ b/src/shared/Database/DBCStructure.h @@ -464,9 +464,9 @@ struct MapEntry // 99 text flags //chat* unknownText2 // 100-115 unknown empty text fields // 116 text flags - int32 parent_map; // 117 map_id of parent map - //float start_x // 118 enter x coordinate (if exist single entry) - //float start_y // 119 enter y coordinate (if exist single entry) + int32 entrance_map; // 117 map_id of entrance map + float entrance_x; // 118 entrance x coordinate (if exist single entry) + float entrance_y; // 119 entrance y coordinate (if exist single entry) uint32 resetTimeRaid; // 120 uint32 resetTimeHeroic; // 121 // 122-123 diff --git a/src/shared/Database/DBCfmt.cpp b/src/shared/Database/DBCfmt.cpp index 2f4df58e6a1..64163664b49 100644 --- a/src/shared/Database/DBCfmt.cpp +++ b/src/shared/Database/DBCfmt.cpp @@ -55,7 +55,7 @@ const char ItemRandomSuffixfmt[]="nxxxxxxxxxxxxxxxxxxiiiiii"; const char ItemSetEntryfmt[]="dssssssssssssssssxxxxxxxxxxxxxxxxxxiiiiiiiiiiiiiiiiii"; const char LockEntryfmt[]="niiiiixxxiiiiixxxiixxxxxxxxxxxxxx"; const char MailTemplateEntryfmt[]="nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; -const char MapEntryfmt[]="nxixssssssssssssssssxxxxxxxixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxixxiixxi"; +const char MapEntryfmt[]="nxixssssssssssssssssxxxxxxxixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiffiixxi"; const char QuestSortEntryfmt[]="nxxxxxxxxxxxxxxxxx"; const char RandomPropertiesPointsfmt[]="niiiiiiiiiiiiiii"; const char SkillLinefmt[]="nixssssssssssssssssxxxxxxxxxxxxxxxxxxi"; diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp index c5b96680a5a..12eb5585c21 100644 --- a/src/shared/Database/SqlOperations.cpp +++ b/src/shared/Database/SqlOperations.cpp @@ -102,7 +102,8 @@ bool SqlQueryHolder::SetQuery(size_t index, const char *sql) if(m_queries[index].first != NULL) { - sLog.outError("Attempt assign query to holder index (%u) where other query stored (Old: [%s] New: [%s])",index,m_queries.size(),m_queries[index].first,sql); + sLog.outError("Attempt assign query to holder index (%u) where other query stored (Old: [%s] New: [%s])", + index,m_queries[index].first,sql); return false; } -- cgit v1.2.3