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

[9777] Fixed instance_template error output arg in one from cases.

Browse source
This commit is contained in:
VladimirMangos 2010-04-22 23:10:20 +04:00
parent 1ef89c7a22
commit 88ab56a6e8
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/ObjectMgr.cpp
View file

@ -4701,14 +4701,16 @@ void ObjectMgr::LoadInstanceTemplate()
MapEntry const* parentEntry = sMapStore.LookupEntry(temp->parent); MapEntry const* parentEntry = sMapStore.LookupEntry(temp->parent);
if (!parentEntry) if (!parentEntry)
{ {
sLog.outErrorDb("ObjectMgr::LoadInstanceTemplate: bad parent map id for instance template %d template!", parentEntry,temp->map); sLog.outErrorDb("ObjectMgr::LoadInstanceTemplate: bad parent map id for instance template %d template!",
parentEntry->MapID, temp->map);
const_cast<InstanceTemplate*>(temp)->parent = 0; const_cast<InstanceTemplate*>(temp)->parent = 0;
continue; continue;
} }
if (parentEntry->IsContinent()) if (parentEntry->IsContinent())
{ {
sLog.outErrorDb("ObjectMgr::LoadInstanceTemplate: parent point to continent map id %u for instance template %d template, ignored, need be set only for non-continent parents!", parentEntry->MapID,temp->map); sLog.outErrorDb("ObjectMgr::LoadInstanceTemplate: parent point to continent map id %u for instance template %d template, ignored, need be set only for non-continent parents!",
parentEntry->MapID,temp->map);
const_cast<InstanceTemplate*>(temp)->parent = 0; const_cast<InstanceTemplate*>(temp)->parent = 0;
continue; continue;
} }

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 "9776" #define REVISION_NR "9777"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__