diff options
Diffstat (limited to 'src/game/ObjectMgr.cpp')
| -rw-r--r-- | src/game/ObjectMgr.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index f673501145d..38555a2cb44 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -799,7 +799,7 @@ void ObjectMgr::ConvertCreatureAddonAuras(CreatureDataAddon* addon, char const* { uint32 currSpellId = 0; bool spell = true; - while (p[0]!=0) + while (p[0] != 0) { ++p; if (p[0] == ' ' || p[0] == 0) @@ -845,7 +845,7 @@ void ObjectMgr::ConvertCreatureAddonAuras(CreatureDataAddon* addon, char const* const_cast<CreatureDataAddonAura*&>(addon->auras) = new CreatureDataAddonAura[val.size()+1]; uint32 i=0; - for (std::map<uint32, uint32>::iterator itr = val.begin(); itr!=val.end();++itr) + for (std::map<uint32, uint32>::iterator itr = val.begin(); itr != val.end();++itr) { CreatureDataAddonAura& cAura = const_cast<CreatureDataAddonAura&>(addon->auras[i]); cAura.spell_id = itr->first; @@ -4086,7 +4086,7 @@ void ObjectMgr::LoadQuests() } - else if (qinfo->RewRepValue[j]!=0) + else if (qinfo->RewRepValue[j] != 0) { sLog.outErrorDb("Quest %u has `RewRepFaction%d` = 0 but `RewRepValue%d` = %i.", qinfo->GetQuestId(),j+1,j+1,qinfo->RewRepValue[j]); @@ -4550,7 +4550,7 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename) continue; } - if (info->type!=GAMEOBJECT_TYPE_DOOR) + if (info->type != GAMEOBJECT_TYPE_DOOR) { sLog.outErrorDb("Table `%s` has gameobject type (%u) non supported by command %s for script id %u",tablename,info->id,(tmp.command == SCRIPT_COMMAND_OPEN_DOOR ? "SCRIPT_COMMAND_OPEN_DOOR" : "SCRIPT_COMMAND_CLOSE_DOOR"),tmp.id); continue; @@ -4862,7 +4862,7 @@ void ObjectMgr::LoadPageTexts() { std::ostringstream ss; ss << "The text page(s) "; - for (std::set<uint32>::iterator itr= checkedPages.begin(); itr!=checkedPages.end(); ++itr) + for (std::set<uint32>::iterator itr= checkedPages.begin(); itr != checkedPages.end(); ++itr) ss << *itr << " "; ss << "create(s) a circular reference, which can cause the server to freeze. Changing Next_Page of page " << pageItr->Page_ID <<" to 0"; @@ -5525,7 +5525,7 @@ void ObjectMgr::LoadGraveyardZones() continue; } - if (team!=0 && team!=HORDE && team!=ALLIANCE) + if (team != 0 && team != HORDE && team != ALLIANCE) { sLog.outErrorDb("Table `game_graveyard_zone` has record for non player faction (%u), skipped.",team); continue; @@ -6236,7 +6236,7 @@ inline void CheckGOLinkedTrapId(GameObjectInfo const* goInfo,uint32 dataN,uint32 { if (GameObjectInfo const* trapInfo = sGOStorage.LookupEntry<GameObjectInfo>(dataN)) { - if (trapInfo->type!=GAMEOBJECT_TYPE_TRAP) + if (trapInfo->type != GAMEOBJECT_TYPE_TRAP) sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) have data%d=%u but GO (Entry %u) have not GAMEOBJECT_TYPE_TRAP (%u) type.", goInfo->id,goInfo->type,N,dataN,dataN,GAMEOBJECT_TYPE_TRAP); } @@ -7686,7 +7686,7 @@ bool ObjectMgr::CheckDeclinedNames(std::wstring mainpart, DeclinedName const& na if (!Utf8toWStr(names.name[i],wname)) return false; - if (mainpart!=GetMainPartOfName(wname,i+1)) + if (mainpart != GetMainPartOfName(wname,i+1)) return false; } return true; @@ -7925,7 +7925,7 @@ SkillRangeType GetSkillRangeType(SkillLineEntry const *pSkill, bool racial) { case SKILL_CATEGORY_LANGUAGES: return SKILL_RANGE_LANGUAGE; case SKILL_CATEGORY_WEAPON: - if (pSkill->id!=SKILL_FIST_WEAPONS) + if (pSkill->id != SKILL_FIST_WEAPONS) return SKILL_RANGE_LEVEL; else return SKILL_RANGE_MONO; @@ -8734,7 +8734,7 @@ bool ObjectMgr::IsVendorItemValid(uint32 vendor_entry, uint32 item_id, int32 max if (maxcount > 0 && incrtime == 0) { if (pl) - ChatHandler(pl).PSendSysMessage("MaxCount!=0 (%u) but IncrTime == 0", maxcount); + ChatHandler(pl).PSendSysMessage("MaxCount != 0 (%u) but IncrTime == 0", maxcount); else sLog.outErrorDb("Table `(game_event_)npc_vendor` has `maxcount` (%u) for item %u of vendor (Entry: %u) but `incrtime`=0, ignore", maxcount, item_id, vendor_entry); return false; |