diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 6d5f42dc9..d2d2e9357 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -574,7 +574,7 @@ bool Creature::AIM_Initialize() return true; } -bool Creature::Create (uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 team, const CreatureData *data) +bool Creature::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 team, const CreatureData *data) { ASSERT(map); SetMap(map); diff --git a/src/game/Creature.h b/src/game/Creature.h index 122af4d9f..cea73e59f 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -470,7 +470,7 @@ class MANGOS_DLL_SPEC Creature : public Unit void AddToWorld(); void RemoveFromWorld(); - bool Create (uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 team, const CreatureData *data = NULL); + bool Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 team, const CreatureData *data = NULL); bool LoadCreaturesAddon(bool reload = false); void SelectLevel(const CreatureInfo *cinfo); void LoadEquipment(uint32 equip_entry, bool force=false); diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp index 1455adf7e..852486ddf 100644 --- a/src/game/MapInstanced.cpp +++ b/src/game/MapInstanced.cpp @@ -182,22 +182,19 @@ InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave *save, Guard guard(*this); // make sure we have a valid map id - const MapEntry* entry = sMapStore.LookupEntry(GetId()); - if(!entry) + if (!sMapStore.LookupEntry(GetId())) { sLog.outError("CreateInstance: no entry for map %d", GetId()); assert(false); } - const InstanceTemplate * iTemplate = objmgr.GetInstanceTemplate(GetId()); - if(!iTemplate) + if (!objmgr.GetInstanceTemplate(GetId())) { sLog.outError("CreateInstance: no instance template for map %d", GetId()); assert(false); } // some instances only have one difficulty - MapDifficulty const* mapDiff = GetMapDifficultyData(GetId(),difficulty); - if (!mapDiff) + if (!GetMapDifficultyData(GetId(),difficulty)) difficulty = DUNGEON_DIFFICULTY_NORMAL; sLog.outDebug("MapInstanced::CreateInstance: %s map instance %d for %d created with difficulty %s", save?"":"new ", InstanceId, GetId(), difficulty?"heroic":"normal"); diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 914e24ce8..0475f2bb5 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -2163,10 +2163,11 @@ void ObjectMgr::LoadPetLevelInfo() if (!result) { barGoLink bar( 1 ); + bar.step(); sLog.outString(); - sLog.outString( ">> Loaded %u level pet stats definitions", count ); - sLog.outErrorDb( "Error loading `pet_levelstats` table or empty table."); + sLog.outString(">> Loaded %u level pet stats definitions", count); + sLog.outErrorDb("Error loading `pet_levelstats` table or empty table."); return; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 19497b51a..2eb1a8396 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8760" + #define REVISION_NR "8761" #endif // __REVISION_NR_H__