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

[8761] typo fix and codestyle

Browse source 
typo was at PetLevelInfo loading
which didn't display the progressbar right when
there was no petlevelinfo available
This commit is contained in:
begemot 2009-11-01 21:02:40 +01:00 • committed by balrok
parent 84573285db
commit e83563b671
5 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Creature.cpp
View file

@ -574,7 +574,7 @@ bool Creature::AIM_Initialize()
return true; 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); ASSERT(map);
SetMap(map); SetMap(map);

2
src/game/Creature.h
View file

@ -470,7 +470,7 @@ class MANGOS_DLL_SPEC Creature : public Unit
void AddToWorld(); void AddToWorld();
void RemoveFromWorld(); 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); bool LoadCreaturesAddon(bool reload = false);
void SelectLevel(const CreatureInfo *cinfo); void SelectLevel(const CreatureInfo *cinfo);
void LoadEquipment(uint32 equip_entry, bool force=false); void LoadEquipment(uint32 equip_entry, bool force=false);

9
src/game/MapInstanced.cpp
View file

@ -182,22 +182,19 @@ InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave *save,
Guard guard(*this); Guard guard(*this);
// make sure we have a valid map id // make sure we have a valid map id
const MapEntry* entry = sMapStore.LookupEntry(GetId()); if (!sMapStore.LookupEntry(GetId()))
if(!entry)
{ {
sLog.outError("CreateInstance: no entry for map %d", GetId()); sLog.outError("CreateInstance: no entry for map %d", GetId());
assert(false); assert(false);
} }
const InstanceTemplate * iTemplate = objmgr.GetInstanceTemplate(GetId()); if (!objmgr.GetInstanceTemplate(GetId()))
if(!iTemplate)
{ {
sLog.outError("CreateInstance: no instance template for map %d", GetId()); sLog.outError("CreateInstance: no instance template for map %d", GetId());
assert(false); assert(false);
} }
// some instances only have one difficulty // some instances only have one difficulty
MapDifficulty const* mapDiff = GetMapDifficultyData(GetId(),difficulty); if (!GetMapDifficultyData(GetId(),difficulty))
if (!mapDiff)
difficulty = DUNGEON_DIFFICULTY_NORMAL; 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"); sLog.outDebug("MapInstanced::CreateInstance: %s map instance %d for %d created with difficulty %s", save?"":"new ", InstanceId, GetId(), difficulty?"heroic":"normal");

5
src/game/ObjectMgr.cpp
View file

@ -2163,10 +2163,11 @@ void ObjectMgr::LoadPetLevelInfo()
if (!result) if (!result)
{ {
barGoLink bar( 1 ); barGoLink bar( 1 );
bar.step();
sLog.outString(); sLog.outString();
sLog.outString( ">> Loaded %u level pet stats definitions", count ); sLog.outString(">> Loaded %u level pet stats definitions", count);
sLog.outErrorDb( "Error loading `pet_levelstats` table or empty table."); sLog.outErrorDb("Error loading `pet_levelstats` table or empty table.");
return; return;
} }

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 "8760" #define REVISION_NR "8761"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__