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

[10293] Correct a not exitan...non-existin... a word that is often spelled wrong

Browse source 
Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-07-30 18:25:19 +02:00
parent 99ac2d43a7
commit 25d9fd265b
43 changed files with 163 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/AccountMgr.cpp
View file

@ -62,7 +62,7 @@ AccountOpResult AccountMgr::DeleteAccount(uint32 accid)
return AOR_NAME_NOT_EXIST; // account doesn't exist return AOR_NAME_NOT_EXIST; // account doesn't exist
delete result; delete result;
// existed characters list // existing characters list
result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE account='%d'",accid); result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE account='%d'",accid);
if (result) if (result)
{ {

16
src/game/AchievementMgr.cpp
View file

@ -115,7 +115,7 @@ bool AchievementCriteriaRequirement::IsValid(AchievementCriteriaEntry const* cri
case ACHIEVEMENT_CRITERIA_REQUIRE_T_CREATURE: case ACHIEVEMENT_CRITERIA_REQUIRE_T_CREATURE:
if (!creature.id || !ObjectMgr::GetCreatureTemplate(creature.id)) if (!creature.id || !ObjectMgr::GetCreatureTemplate(creature.id))
{ {
sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_CREATURE (%u) have not existed creature id in value1 (%u), ignore.", sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_CREATURE (%u) have nonexistent creature id in value1 (%u), ignore.",
criteria->ID, criteria->requiredType,requirementType,creature.id); criteria->ID, criteria->requiredType,requirementType,creature.id);
return false; return false;
} }
@ -129,13 +129,13 @@ bool AchievementCriteriaRequirement::IsValid(AchievementCriteriaEntry const* cri
} }
if (classRace.class_id && ((1 << (classRace.class_id-1)) & CLASSMASK_ALL_PLAYABLE)==0) if (classRace.class_id && ((1 << (classRace.class_id-1)) & CLASSMASK_ALL_PLAYABLE)==0)
{ {
sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_CREATURE (%u) have not existed class in value1 (%u), ignore.", sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_CREATURE (%u) have nonexistent class in value1 (%u), ignore.",
criteria->ID, criteria->requiredType,requirementType,classRace.class_id); criteria->ID, criteria->requiredType,requirementType,classRace.class_id);
return false; return false;
} }
if (classRace.race_id && ((1 << (classRace.race_id-1)) & RACEMASK_ALL_PLAYABLE)==0) if (classRace.race_id && ((1 << (classRace.race_id-1)) & RACEMASK_ALL_PLAYABLE)==0)
{ {
sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_CREATURE (%u) have not existed race in value2 (%u), ignore.", sLog.outErrorDb( "Table `achievement_criteria_requirement` (Entry: %u Type: %u) for requirement ACHIEVEMENT_CRITERIA_REQUIRE_CREATURE (%u) have nonexistent race in value2 (%u), ignore.",
criteria->ID, criteria->requiredType,requirementType,classRace.race_id); criteria->ID, criteria->requiredType,requirementType,classRace.race_id);
return false; return false;
} }
@ -591,8 +591,8 @@ void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *cri
AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(id); AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(id);
if (!criteria) if (!criteria)
{ {
// we will remove not existed criteria for all characters // we will remove nonexistent criteria for all characters
sLog.outError("Not existed achievement criteria %u data removed from table `character_achievement_progress`.",id); sLog.outError("Nonexistent achievement criteria %u data removed from table `character_achievement_progress`.",id);
CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE criteria = %u",id); CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE criteria = %u",id);
continue; continue;
} }
@ -2097,8 +2097,8 @@ void AchievementGlobalMgr::LoadCompletedAchievements()
uint32 achievement_id = fields[0].GetUInt32(); uint32 achievement_id = fields[0].GetUInt32();
if(!sAchievementStore.LookupEntry(achievement_id)) if(!sAchievementStore.LookupEntry(achievement_id))
{ {
// we will remove not existed achievement for all characters // we will remove nonexistent achievement for all characters
sLog.outError("Not existed achievement %u data removed from table `character_achievement`.",achievement_id); sLog.outError("Nonexistent achievement %u data removed from table `character_achievement`.",achievement_id);
CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE achievement = %u",achievement_id); CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE achievement = %u",achievement_id);
continue; continue;
} }
@ -2273,7 +2273,7 @@ void AchievementGlobalMgr::LoadRewardLocales()
if(m_achievementRewards.find(entry)==m_achievementRewards.end()) if(m_achievementRewards.find(entry)==m_achievementRewards.end())
{ {
sLog.outErrorDb( "Table `locales_achievement_reward` (Entry: %u) has locale strings for not existed achievement reward .", entry); sLog.outErrorDb( "Table `locales_achievement_reward` (Entry: %u) has locale strings for nonexistent achievement reward .", entry);
continue; continue;
} }

2
src/game/AuctionHouseHandler.cpp
View file

@ -486,7 +486,7 @@ void WorldSession::HandleAuctionRemoveItem( WorldPacket & recv_data )
} }
else else
{ {
sLog.outError("Auction id: %u has non-existed item (item guid : %u)!!!", auction->Id, auction->item_guidlow); sLog.outError("Auction id: %u has nonexistent item (item guid : %u)!!!", auction->Id, auction->item_guidlow);
SendAuctionCommandResult( 0, AUCTION_CANCEL, AUCTION_INTERNAL_ERROR ); SendAuctionCommandResult( 0, AUCTION_CANCEL, AUCTION_INTERNAL_ERROR );
return; return;
} }

2
src/game/BattleGroundEY.cpp
View file

@ -171,7 +171,7 @@ void BattleGroundEY::CheckSomeoneLeftPoint()
if (!plr) if (!plr)
{ {
sLog.outError("BattleGroundEY:CheckSomeoneLeftPoint Player (GUID: %u) not found!", GUID_LOPART(m_PlayersNearPoint[i][j])); sLog.outError("BattleGroundEY:CheckSomeoneLeftPoint Player (GUID: %u) not found!", GUID_LOPART(m_PlayersNearPoint[i][j]));
//move not existed player to "free space" - this will cause many error showing in log, but it is a very important bug //move nonexistent player to "free space" - this will cause many error showing in log, but it is a very important bug
m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS].push_back(m_PlayersNearPoint[i][j]); m_PlayersNearPoint[BG_EY_PLAYERS_OUT_OF_POINTS].push_back(m_PlayersNearPoint[i][j]);
m_PlayersNearPoint[i].erase(m_PlayersNearPoint[i].begin() + j); m_PlayersNearPoint[i].erase(m_PlayersNearPoint[i].begin() + j);
++j; ++j;

14
src/game/BattleGroundMgr.cpp
View file

@ -1671,7 +1671,7 @@ void BattleGroundMgr::CreateInitialBattleGrounds()
} }
else else
{ {
sLog.outErrorDb("Table `battleground_template` for id %u have non-existed WorldSafeLocs.dbc id %u in field `AllianceStartLoc`. BG not created.", bgTypeID, start1); sLog.outErrorDb("Table `battleground_template` for id %u have nonexistent WorldSafeLocs.dbc id %u in field `AllianceStartLoc`. BG not created.", bgTypeID, start1);
continue; continue;
} }
@ -1694,7 +1694,7 @@ void BattleGroundMgr::CreateInitialBattleGrounds()
} }
else else
{ {
sLog.outErrorDb("Table `battleground_template` for id %u have non-existed WorldSafeLocs.dbc id %u in field `HordeStartLoc`. BG not created.", bgTypeID, start2); sLog.outErrorDb("Table `battleground_template` for id %u have nonexistent WorldSafeLocs.dbc id %u in field `HordeStartLoc`. BG not created.", bgTypeID, start2);
continue; continue;
} }
@ -1855,7 +1855,7 @@ void BattleGroundMgr::SendToBattleGround(Player *pl, uint32 instanceId, BattleGr
} }
else else
{ {
sLog.outError("player %u trying to port to non-existent bg instance %u",pl->GetGUIDLow(), instanceId); sLog.outError("player %u trying to port to nonexistent bg instance %u",pl->GetGUIDLow(), instanceId);
} }
} }
@ -1928,7 +1928,7 @@ BattleGroundTypeId BattleGroundMgr::BGTemplateId(BattleGroundQueueTypeId bgQueue
case BATTLEGROUND_QUEUE_5v5: case BATTLEGROUND_QUEUE_5v5:
return BATTLEGROUND_AA; return BATTLEGROUND_AA;
default: default:
return BattleGroundTypeId(0); // used for unknown template (it existed and do nothing) return BattleGroundTypeId(0); // used for unknown template (it exist and do nothing)
} }
} }
@ -2033,7 +2033,7 @@ void BattleGroundMgr::LoadBattleMastersEntry()
uint32 bgTypeId = fields[1].GetUInt32(); uint32 bgTypeId = fields[1].GetUInt32();
if (!sBattlemasterListStore.LookupEntry(bgTypeId)) if (!sBattlemasterListStore.LookupEntry(bgTypeId))
{ {
sLog.outErrorDb("Table `battlemaster_entry` contain entry %u for not existed battleground type %u, ignored.",entry,bgTypeId); sLog.outErrorDb("Table `battlemaster_entry` contain entry %u for nonexistent battleground type %u, ignored.",entry,bgTypeId);
continue; continue;
} }
@ -2153,7 +2153,7 @@ void BattleGroundMgr::LoadBattleEventIndexes()
// checking for NULL - through right outer join this will mean following: // checking for NULL - through right outer join this will mean following:
if (fields[5].GetUInt32() != dbTableGuidLow) if (fields[5].GetUInt32() != dbTableGuidLow)
{ {
sLog.outErrorDb("BattleGroundEvent: %s with nonexistant guid %u for event: map:%u, event1:%u, event2:%u (\"%s\")", sLog.outErrorDb("BattleGroundEvent: %s with nonexistent guid %u for event: map:%u, event1:%u, event2:%u (\"%s\")",
(gameobject) ? "gameobject" : "creature", dbTableGuidLow, map, events.event1, events.event2, description); (gameobject) ? "gameobject" : "creature", dbTableGuidLow, map, events.event1, events.event2, description);
continue; continue;
} }
@ -2170,7 +2170,7 @@ void BattleGroundMgr::LoadBattleEventIndexes()
// we have an event which shouldn't exist // we have an event which shouldn't exist
else else
{ {
sLog.outErrorDb("BattleGroundEvent: %s with guid %u is registered, for a nonexistant event: map:%u, event1:%u, event2:%u", sLog.outErrorDb("BattleGroundEvent: %s with guid %u is registered, for a nonexistent event: map:%u, event1:%u, event2:%u",
(gameobject) ? "gameobject" : "creature", dbTableGuidLow, map, events.event1, events.event2); (gameobject) ? "gameobject" : "creature", dbTableGuidLow, map, events.event1, events.event2);
continue; continue;
} }

4
src/game/CharacterHandler.cpp
View file

@ -650,7 +650,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
pCurrChar->SetRank(fields[1].GetUInt32()); pCurrChar->SetRank(fields[1].GetUInt32());
delete resultGuild; delete resultGuild;
} }
else if(pCurrChar->GetGuildId()) // clear guild related fields in case wrong data about non existed membership else if(pCurrChar->GetGuildId()) // clear guild related fields in case wrong data about nonexistent membership
{ {
pCurrChar->SetInGuild(0); pCurrChar->SetInGuild(0);
pCurrChar->SetRank(0); pCurrChar->SetRank(0);
@ -675,7 +675,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
else else
{ {
// remove wrong guild data // remove wrong guild data
sLog.outError("Player %s (GUID: %u) marked as member not existed guild (id: %u), removing guild membership for player.",pCurrChar->GetName(),pCurrChar->GetGUIDLow(),pCurrChar->GetGuildId()); sLog.outError("Player %s (GUID: %u) marked as member of nonexistent guild (id: %u), removing guild membership for player.",pCurrChar->GetName(),pCurrChar->GetGUIDLow(),pCurrChar->GetGuildId());
pCurrChar->SetInGuild(0); pCurrChar->SetInGuild(0);
} }
} }

2
src/game/Chat.cpp
View file

@ -1195,7 +1195,7 @@ bool ChatHandler::SetDataForCommandInTable(ChatCommand *commandTable, const char
} }
case CHAT_COMMAND_UNKNOWN: case CHAT_COMMAND_UNKNOWN:
{ {
sLog.outErrorDb("Table `command` have not existed command '%s', skip.", cmdName.c_str()); sLog.outErrorDb("Table `command` have nonexistent command '%s', skip.", cmdName.c_str());
return false; return false;
} }
} }

2
src/game/Creature.cpp
View file

@ -904,7 +904,7 @@ void Creature::SetLootRecipient(Unit *unit)
// set player for non group case or if group will disbanded // set player for non group case or if group will disbanded
m_lootRecipientGuid = player->GetObjectGuid(); m_lootRecipientGuid = player->GetObjectGuid();
// set group for group existed case including if player will leave group at loot time // set group for group existing case including if player will leave group at loot time
if (Group* group = player->GetGroup()) if (Group* group = player->GetGroup())
m_lootGroupRecipientId = group->GetId(); m_lootGroupRecipientId = group->GetId();

48
src/game/CreatureEventAIMgr.cpp
View file

@ -334,7 +334,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
SpellEntry const* pSpell = sSpellStore.LookupEntry(temp.spell_hit.spellId); SpellEntry const* pSpell = sSpellStore.LookupEntry(temp.spell_hit.spellId);
if (!pSpell) if (!pSpell)
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u has non-existant SpellID(%u) defined in event %u.", temp.creature_id, temp.spell_hit.spellId, i); sLog.outErrorDb("CreatureEventAI: Creature %u has nonexistent SpellID(%u) defined in event %u.", temp.creature_id, temp.spell_hit.spellId, i);
continue; continue;
} }
@ -388,7 +388,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
SpellEntry const* pSpell = sSpellStore.LookupEntry(temp.spell_hit.spellId); SpellEntry const* pSpell = sSpellStore.LookupEntry(temp.spell_hit.spellId);
if (!pSpell) if (!pSpell)
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u has non-existant SpellID(%u) defined in event %u.", temp.creature_id, temp.spell_hit.spellId, i); sLog.outErrorDb("CreatureEventAI: Creature %u has nonexistent SpellID(%u) defined in event %u.", temp.creature_id, temp.spell_hit.spellId, i);
continue; continue;
} }
if (temp.friendly_buff.repeatMax < temp.friendly_buff.repeatMin) if (temp.friendly_buff.repeatMax < temp.friendly_buff.repeatMin)
@ -407,14 +407,14 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
case EVENT_T_SUMMONED_JUST_DIED: case EVENT_T_SUMMONED_JUST_DIED:
case EVENT_T_SUMMONED_JUST_DESPAWN: case EVENT_T_SUMMONED_JUST_DESPAWN:
if (!sCreatureStorage.LookupEntry<CreatureInfo>(temp.summoned.creatureId)) if (!sCreatureStorage.LookupEntry<CreatureInfo>(temp.summoned.creatureId))
sLog.outErrorDb("CreatureEventAI: Creature %u are using event(%u) with not existed creature template id (%u) in param1, skipped.", temp.creature_id, i, temp.summoned.creatureId); sLog.outErrorDb("CreatureEventAI: Creature %u are using event(%u) with nonexistent creature template id (%u) in param1, skipped.", temp.creature_id, i, temp.summoned.creatureId);
if (temp.summoned.repeatMax < temp.summoned.repeatMin) if (temp.summoned.repeatMax < temp.summoned.repeatMin)
sLog.outErrorDb("CreatureEventAI: Creature %u are using event(%u) with param2 < param1 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i); sLog.outErrorDb("CreatureEventAI: Creature %u are using event(%u) with param2 < param1 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
break; break;
case EVENT_T_QUEST_ACCEPT: case EVENT_T_QUEST_ACCEPT:
case EVENT_T_QUEST_COMPLETE: case EVENT_T_QUEST_COMPLETE:
if (!sObjectMgr.GetQuestTemplate(temp.quest.questId)) if (!sObjectMgr.GetQuestTemplate(temp.quest.questId))
sLog.outErrorDb("CreatureEventAI: Creature %u are using event(%u) with not existed qyest id (%u) in param1, skipped.", temp.creature_id, i, temp.quest.questId); sLog.outErrorDb("CreatureEventAI: Creature %u are using event(%u) with nonexistent quest id (%u) in param1, skipped.", temp.creature_id, i, temp.quest.questId);
sLog.outErrorDb("CreatureEventAI: Creature %u using not implemented event (%u) in event %u.", temp.creature_id, temp.event_id, i); sLog.outErrorDb("CreatureEventAI: Creature %u using not implemented event (%u) in event %u.", temp.creature_id, temp.event_id, i);
continue; continue;
@ -461,7 +461,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
SpellEntry const* pSpell = sSpellStore.LookupEntry(temp.buffed.spellId); SpellEntry const* pSpell = sSpellStore.LookupEntry(temp.buffed.spellId);
if (!pSpell) if (!pSpell)
{ {
sLog.outErrorDb("CreatureEventAI: Creature %u has non-existant SpellID(%u) defined in event %u.", temp.creature_id, temp.spell_hit.spellId, i); sLog.outErrorDb("CreatureEventAI: Creature %u has nonexistent SpellID(%u) defined in event %u.", temp.creature_id, temp.spell_hit.spellId, i);
continue; continue;
} }
if (temp.buffed.repeatMax < temp.buffed.repeatMin) if (temp.buffed.repeatMax < temp.buffed.repeatMin)
@ -526,7 +526,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
case ACTION_T_SET_FACTION: case ACTION_T_SET_FACTION:
if (action.set_faction.factionId !=0 && !sFactionStore.LookupEntry(action.set_faction.factionId)) if (action.set_faction.factionId !=0 && !sFactionStore.LookupEntry(action.set_faction.factionId))
{ {
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existent FactionId %u.", i, j+1, action.set_faction.factionId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent FactionId %u.", i, j+1, action.set_faction.factionId);
action.set_faction.factionId = 0; action.set_faction.factionId = 0;
} }
break; break;
@ -535,7 +535,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
{ {
if (action.morph.creatureId && !sCreatureStorage.LookupEntry<CreatureInfo>(action.morph.creatureId)) if (action.morph.creatureId && !sCreatureStorage.LookupEntry<CreatureInfo>(action.morph.creatureId))
{ {
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existant Creature entry %u.", i, j+1, action.morph.creatureId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent Creature entry %u.", i, j+1, action.morph.creatureId);
action.morph.creatureId = 0; action.morph.creatureId = 0;
} }
@ -548,7 +548,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
} }
else if (!sCreatureDisplayInfoStore.LookupEntry(action.morph.modelId)) else if (!sCreatureDisplayInfoStore.LookupEntry(action.morph.modelId))
{ {
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existant ModelId %u.", i, j+1, action.morph.modelId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent ModelId %u.", i, j+1, action.morph.modelId);
action.morph.modelId = 0; action.morph.modelId = 0;
} }
} }
@ -556,7 +556,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
break; break;
case ACTION_T_SOUND: case ACTION_T_SOUND:
if (!sSoundEntriesStore.LookupEntry(action.sound.soundId)) if (!sSoundEntriesStore.LookupEntry(action.sound.soundId))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existant SoundID %u.", i, j+1, action.sound.soundId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent SoundID %u.", i, j+1, action.sound.soundId);
break; break;
case ACTION_T_EMOTE: case ACTION_T_EMOTE:
if (!sEmotesStore.LookupEntry(action.emote.emoteId)) if (!sEmotesStore.LookupEntry(action.emote.emoteId))
@ -564,11 +564,11 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
break; break;
case ACTION_T_RANDOM_SOUND: case ACTION_T_RANDOM_SOUND:
if (!sSoundEntriesStore.LookupEntry(action.random_sound.soundId1)) if (!sSoundEntriesStore.LookupEntry(action.random_sound.soundId1))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u param1 uses non-existant SoundID %u.", i, j+1, action.random_sound.soundId1); sLog.outErrorDb("CreatureEventAI: Event %u Action %u param1 uses nonexistent SoundID %u.", i, j+1, action.random_sound.soundId1);
if (action.random_sound.soundId2 >= 0 && !sSoundEntriesStore.LookupEntry(action.random_sound.soundId2)) if (action.random_sound.soundId2 >= 0 && !sSoundEntriesStore.LookupEntry(action.random_sound.soundId2))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u param2 uses non-existant SoundID %u.", i, j+1, action.random_sound.soundId2); sLog.outErrorDb("CreatureEventAI: Event %u Action %u param2 uses nonexistent SoundID %u.", i, j+1, action.random_sound.soundId2);
if (action.random_sound.soundId3 >= 0 && !sSoundEntriesStore.LookupEntry(action.random_sound.soundId3)) if (action.random_sound.soundId3 >= 0 && !sSoundEntriesStore.LookupEntry(action.random_sound.soundId3))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u param3 uses non-existant SoundID %u.", i, j+1, action.random_sound.soundId3); sLog.outErrorDb("CreatureEventAI: Event %u Action %u param3 uses nonexistent SoundID %u.", i, j+1, action.random_sound.soundId3);
break; break;
case ACTION_T_RANDOM_EMOTE: case ACTION_T_RANDOM_EMOTE:
if (!sEmotesStore.LookupEntry(action.random_emote.emoteId1)) if (!sEmotesStore.LookupEntry(action.random_emote.emoteId1))
@ -582,7 +582,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
{ {
const SpellEntry *spell = sSpellStore.LookupEntry(action.cast.spellId); const SpellEntry *spell = sSpellStore.LookupEntry(action.cast.spellId);
if (!spell) if (!spell)
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existent SpellID %u.", i, j+1, action.cast.spellId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent SpellID %u.", i, j+1, action.cast.spellId);
/* FIXME: temp.raw.param3 not have event tipes with recovery time in it.... /* FIXME: temp.raw.param3 not have event tipes with recovery time in it....
else else
{ {
@ -605,7 +605,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
} }
case ACTION_T_SUMMON: case ACTION_T_SUMMON:
if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.summon.creatureId)) if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.summon.creatureId))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existent creature entry %u.", i, j+1, action.summon.creatureId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent creature entry %u.", i, j+1, action.summon.creatureId);
if (action.summon.target >= TARGET_T_END) if (action.summon.target >= TARGET_T_END)
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses incorrect Target type", i, j+1); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses incorrect Target type", i, j+1);
@ -627,7 +627,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
sLog.outErrorDb("CreatureEventAI: Event %u Action %u. SpecialFlags for quest entry %u does not include |2, Action will not have any effect.", i, j+1, action.quest_event.questId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u. SpecialFlags for quest entry %u does not include |2, Action will not have any effect.", i, j+1, action.quest_event.questId);
} }
else else
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existent Quest entry %u.", i, j+1, action.quest_event.questId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent Quest entry %u.", i, j+1, action.quest_event.questId);
if (action.quest_event.target >= TARGET_T_END) if (action.quest_event.target >= TARGET_T_END)
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses incorrect Target type", i, j+1); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses incorrect Target type", i, j+1);
@ -635,9 +635,9 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
break; break;
case ACTION_T_CAST_EVENT: case ACTION_T_CAST_EVENT:
if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.cast_event.creatureId)) if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.cast_event.creatureId))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existent creature entry %u.", i, j+1, action.cast_event.creatureId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent creature entry %u.", i, j+1, action.cast_event.creatureId);
if (!sSpellStore.LookupEntry(action.cast_event.spellId)) if (!sSpellStore.LookupEntry(action.cast_event.spellId))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existent SpellID %u.", i, j+1, action.cast_event.spellId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent SpellID %u.", i, j+1, action.cast_event.spellId);
if (action.cast_event.target >= TARGET_T_END) if (action.cast_event.target >= TARGET_T_END)
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses incorrect Target type", i, j+1); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses incorrect Target type", i, j+1);
break; break;
@ -669,17 +669,17 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
sLog.outErrorDb("CreatureEventAI: Event %u Action %u. SpecialFlags for quest entry %u does not include |2, Action will not have any effect.", i, j+1, action.quest_event_all.questId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u. SpecialFlags for quest entry %u does not include |2, Action will not have any effect.", i, j+1, action.quest_event_all.questId);
} }
else else
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existent Quest entry %u.", i, j+1, action.quest_event_all.questId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent Quest entry %u.", i, j+1, action.quest_event_all.questId);
break; break;
case ACTION_T_CAST_EVENT_ALL: case ACTION_T_CAST_EVENT_ALL:
if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.cast_event_all.creatureId)) if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.cast_event_all.creatureId))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existent creature entry %u.", i, j+1, action.cast_event_all.creatureId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent creature entry %u.", i, j+1, action.cast_event_all.creatureId);
if (!sSpellStore.LookupEntry(action.cast_event_all.spellId)) if (!sSpellStore.LookupEntry(action.cast_event_all.spellId))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existent SpellID %u.", i, j+1, action.cast_event_all.spellId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent SpellID %u.", i, j+1, action.cast_event_all.spellId);
break; break;
case ACTION_T_REMOVEAURASFROMSPELL: case ACTION_T_REMOVEAURASFROMSPELL:
if (!sSpellStore.LookupEntry(action.remove_aura.spellId)) if (!sSpellStore.LookupEntry(action.remove_aura.spellId))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existent SpellID %u.", i, j+1, action.remove_aura.spellId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent SpellID %u.", i, j+1, action.remove_aura.spellId);
if (action.remove_aura.target >= TARGET_T_END) if (action.remove_aura.target >= TARGET_T_END)
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses incorrect Target type", i, j+1); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses incorrect Target type", i, j+1);
break; break;
@ -705,7 +705,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
break; break;
case ACTION_T_SUMMON_ID: case ACTION_T_SUMMON_ID:
if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.summon_id.creatureId)) if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.summon_id.creatureId))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existant creature entry %u.", i, j+1, action.summon_id.creatureId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent creature entry %u.", i, j+1, action.summon_id.creatureId);
if (action.summon_id.target >= TARGET_T_END) if (action.summon_id.target >= TARGET_T_END)
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses incorrect Target type", i, j+1); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses incorrect Target type", i, j+1);
if (m_CreatureEventAI_Summon_Map.find(action.summon_id.spawnId) == m_CreatureEventAI_Summon_Map.end()) if (m_CreatureEventAI_Summon_Map.find(action.summon_id.spawnId) == m_CreatureEventAI_Summon_Map.end())
@ -713,7 +713,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
break; break;
case ACTION_T_KILLED_MONSTER: case ACTION_T_KILLED_MONSTER:
if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.killed_monster.creatureId)) if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.killed_monster.creatureId))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existant creature entry %u.", i, j+1, action.killed_monster.creatureId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent creature entry %u.", i, j+1, action.killed_monster.creatureId);
if (action.killed_monster.target >= TARGET_T_END) if (action.killed_monster.target >= TARGET_T_END)
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses incorrect Target type", i, j+1); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses incorrect Target type", i, j+1);
break; break;
@ -731,7 +731,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
break; break;
case ACTION_T_UPDATE_TEMPLATE: case ACTION_T_UPDATE_TEMPLATE:
if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.update_template.creatureId)) if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.update_template.creatureId))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existant creature entry %u.", i, j+1, action.update_template.creatureId); sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses nonexistent creature entry %u.", i, j+1, action.update_template.creatureId);
break; break;
case ACTION_T_SET_SHEATH: case ACTION_T_SET_SHEATH:
if (action.set_sheath.sheath >= MAX_SHEATH_STATE) if (action.set_sheath.sheath >= MAX_SHEATH_STATE)

4
src/game/DBCStores.cpp
View file

@ -326,7 +326,7 @@ inline void LoadDBC(LocalData& localeData,barGoLink& bar, StoreProblemList& errl
} }
else else
{ {
// sort problematic dbc to (1) non compatible and (2) non-existed // sort problematic dbc to (1) non compatible and (2) nonexistent
FILE * f=fopen(dbc_filename.c_str(),"rb"); FILE * f=fopen(dbc_filename.c_str(),"rb");
if(f) if(f)
{ {
@ -586,7 +586,7 @@ void LoadDBCStores(const std::string& dataPath)
sTaxiPathNodesByPath[entry->path].set(entry->index, entry); sTaxiPathNodesByPath[entry->path].set(entry->index, entry);
// Initialize global taxinodes mask // Initialize global taxinodes mask
// include existed nodes that have at least single not spell base (scripted) path // include existing nodes that have at least single not spell base (scripted) path
{ {
std::set<uint32> spellPaths; std::set<uint32> spellPaths;
for(uint32 i = 1; i < sSpellStore.GetNumRows (); ++i) for(uint32 i = 1; i < sSpellStore.GetNumRows (); ++i)

4
src/game/GameEventMgr.cpp
View file

@ -157,7 +157,7 @@ void GameEventMgr::LoadFromDB()
{ {
if(!sHolidaysStore.LookupEntry(pGameEvent.holiday_id)) if(!sHolidaysStore.LookupEntry(pGameEvent.holiday_id))
{ {
sLog.outErrorDb("`game_event` game event id (%i) have not existed holiday id %u.",event_id,pGameEvent.holiday_id); sLog.outErrorDb("`game_event` game event id (%i) have nonexistent holiday id %u.",event_id,pGameEvent.holiday_id);
pGameEvent.holiday_id = HOLIDAY_NONE; pGameEvent.holiday_id = HOLIDAY_NONE;
} }
} }
@ -605,7 +605,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
sObjectMgr.AddGameobjectToGrid(*itr, data); sObjectMgr.AddGameobjectToGrid(*itr, data);
// Spawn if necessary (loaded grids only) // Spawn if necessary (loaded grids only)
// this base map checked as non-instanced and then only existed // this base map checked as non-instanced and then only existing
Map* map = const_cast<Map*>(sMapMgr.CreateBaseMap(data->mapid)); Map* map = const_cast<Map*>(sMapMgr.CreateBaseMap(data->mapid));
// We use current coords to unspawn, not spawn coords since creature can have changed grid // We use current coords to unspawn, not spawn coords since creature can have changed grid
if(!map->Instanceable() && map->IsLoaded(data->posX, data->posY)) if(!map->Instanceable() && map->IsLoaded(data->posX, data->posY))

4
src/game/GameObject.cpp
View file

@ -301,7 +301,7 @@ void GameObject::Update(uint32 /*p_time*/)
} }
else // environmental trap else // environmental trap
{ {
// environmental damage spells already have around enemies targeting but this not help in case not existed GO casting support // environmental damage spells already have around enemies targeting but this not help in case nonexistent GO casting support
// affect only players // affect only players
Player* p_ok = NULL; Player* p_ok = NULL;
@ -1192,7 +1192,7 @@ void GameObject::Use(Unit* user)
return; return;
spellId = info->summoningRitual.spellId; spellId = info->summoningRitual.spellId;
if (spellId == 62330) // GO store not existed spell, replace by expected if (spellId == 62330) // GO store nonexistent spell, replace by expected
{ {
// spell have reagent and mana cost but it not expected use its // spell have reagent and mana cost but it not expected use its
// it triggered spell in fact casted at currently channeled GO // it triggered spell in fact casted at currently channeled GO

2
src/game/GossipDef.cpp
View file

@ -213,7 +213,7 @@ void PlayerMenu::SendPointOfInterest( uint32 poi_id )
PointOfInterest const* poi = sObjectMgr.GetPointOfInterest(poi_id); PointOfInterest const* poi = sObjectMgr.GetPointOfInterest(poi_id);
if(!poi) if(!poi)
{ {
sLog.outErrorDb("Requested send not existed POI (Id: %u), ignore.",poi_id); sLog.outErrorDb("Requested send nonexistent POI (Id: %u), ignore.",poi_id);
return; return;
} }

2
src/game/Group.cpp
View file

@ -208,7 +208,7 @@ bool Group::LoadMemberFromDB(uint32 guidLow, uint8 subgroup, bool assistant)
MemberSlot member; MemberSlot member;
member.guid = MAKE_NEW_GUID(guidLow, 0, HIGHGUID_PLAYER); member.guid = MAKE_NEW_GUID(guidLow, 0, HIGHGUID_PLAYER);
// skip non-existed member // skip nonexistent member
if(!sObjectMgr.GetPlayerNameByGUID(member.guid, member.name)) if(!sObjectMgr.GetPlayerNameByGUID(member.guid, member.name))
return false; return false;

2
src/game/GroupHandler.cpp
View file

@ -143,7 +143,7 @@ void WorldSession::HandleGroupInviteOpcode( WorldPacket & recv_data )
} }
else else
{ {
// already existed group: if can't add then just leave // already existing group: if can't add then just leave
if(!group->AddInvite(player)) if(!group->AddInvite(player))
{ {
return; return;

2
src/game/InstanceData.h
View file

@ -72,7 +72,7 @@ class MANGOS_DLL_SPEC InstanceData
virtual void SetData(uint32 /*Type*/, uint32 /*Data*/) {} virtual void SetData(uint32 /*Type*/, uint32 /*Data*/) {}
// Achievement criteria additional requirements check // Achievement criteria additional requirements check
// NOTE: not use this if same can be checked existed requirement types from AchievementCriteriaRequirementType // NOTE: not use this if same can be checked existing requirement types from AchievementCriteriaRequirementType
virtual bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0); virtual bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0);
// Condition criteria additional requirements check // Condition criteria additional requirements check

2
src/game/InstanceSaveMgr.h
View file

@ -175,7 +175,7 @@ class InstanceResetScheduler
InstanceSaveManager& m_InstanceSaves; InstanceSaveManager& m_InstanceSaves;
// fast lookup for reset times (always use existed functions for access/set) // fast lookup for reset times (always use existing functions for access/set)
typedef UNORDERED_MAP<uint32 /*PAIR32(map,difficulty)*/,time_t /*resetTime*/> ResetTimeByMapDifficultyMap; typedef UNORDERED_MAP<uint32 /*PAIR32(map,difficulty)*/,time_t /*resetTime*/> ResetTimeByMapDifficultyMap;
ResetTimeByMapDifficultyMap m_resetTimeByMapDifficulty; ResetTimeByMapDifficultyMap m_resetTimeByMapDifficulty;

2
src/game/ItemHandler.cpp
View file

@ -1316,7 +1316,7 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
if (iGemProto->ItemLimitCategory == Gems[j]->GetProto()->ItemLimitCategory) if (iGemProto->ItemLimitCategory == Gems[j]->GetProto()->ItemLimitCategory)
++limit_newcount; ++limit_newcount;
} }
// existed gem // existing gem
else if(OldEnchants[j]) else if(OldEnchants[j])
{ {
if(SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(OldEnchants[j])) if(SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(OldEnchants[j]))

2
src/game/Level1.cpp
View file

@ -1956,7 +1956,7 @@ bool ChatHandler::HandleSendMailCommand(const char* args)
std::string subject = msgSubject; std::string subject = msgSubject;
std::string text = msgText; std::string text = msgText;
// from console show not existed sender // from console show nonexistent sender
MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM); MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM);
MailDraft(subject, text) MailDraft(subject, text)

4
src/game/Level2.cpp
View file

@ -1564,7 +1564,7 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args)
} }
} }
// now lowguid is low guid really existed creature // now lowguid is low guid really existing creature
// and pCreature point (maybe) to this creature or NULL // and pCreature point (maybe) to this creature or NULL
MovementGeneratorType move_type; MovementGeneratorType move_type;
@ -4599,7 +4599,7 @@ bool ChatHandler::HandleTitlesSetMaskCommand(const char* args)
if (CharTitlesEntry const* tEntry = sCharTitlesStore.LookupEntry(i)) if (CharTitlesEntry const* tEntry = sCharTitlesStore.LookupEntry(i))
titles2 &= ~(uint64(1) << tEntry->bit_index); titles2 &= ~(uint64(1) << tEntry->bit_index);
titles &= ~titles2; // remove not existed titles titles &= ~titles2; // remove nonexistent titles
target->SetUInt64Value(PLAYER__FIELD_KNOWN_TITLES, titles); target->SetUInt64Value(PLAYER__FIELD_KNOWN_TITLES, titles);
SendSysMessage(LANG_DONE); SendSysMessage(LANG_DONE);

10
src/game/Level3.cpp
View file

@ -6050,7 +6050,7 @@ bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/)
save->GetDifficulty(), save->CanReset() ? "yes" : "no", timeleft.c_str()); save->GetDifficulty(), save->CanReset() ? "yes" : "no", timeleft.c_str());
} }
else else
PSendSysMessage("bound for a nonexistant map %u", itr->first); PSendSysMessage("bound for a nonexistent map %u", itr->first);
counter++; counter++;
} }
} }
@ -6073,7 +6073,7 @@ bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/)
save->GetDifficulty(), save->CanReset() ? "yes" : "no", timeleft.c_str()); save->GetDifficulty(), save->CanReset() ? "yes" : "no", timeleft.c_str());
} }
else else
PSendSysMessage("bound for a nonexistant map %u", itr->first); PSendSysMessage("bound for a nonexistent map %u", itr->first);
counter++; counter++;
} }
} }
@ -6126,7 +6126,7 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char* args)
save->GetDifficulty(), save->CanReset() ? "yes" : "no", timeleft.c_str()); save->GetDifficulty(), save->CanReset() ? "yes" : "no", timeleft.c_str());
} }
else else
PSendSysMessage("bound for a nonexistant map %u", itr->first); PSendSysMessage("bound for a nonexistent map %u", itr->first);
player->UnbindInstance(itr, Difficulty(i)); player->UnbindInstance(itr, Difficulty(i));
counter++; counter++;
} }
@ -6398,7 +6398,7 @@ bool ChatHandler::HandleSendItemsCommand(const char* args)
} }
} }
// from console show not existed sender // from console show nonexistent sender
MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM); MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM);
// fill mail // fill mail
@ -6456,7 +6456,7 @@ bool ChatHandler::HandleSendMoneyCommand(const char* args)
std::string subject = msgSubject; std::string subject = msgSubject;
std::string text = msgText; std::string text = msgText;
// from console show not existed sender // from console show nonexistent sender
MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM); MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM);
MailDraft(subject, text) MailDraft(subject, text)

2
src/game/LootMgr.cpp
View file

@ -153,7 +153,7 @@ void LootStore::LoadLootTable()
} }
} }
// else is empty - template Id and iter are the same // else is empty - template Id and iter are the same
// finally iter refers to already existed or just created <entry, LootTemplate> // finally iter refers to already existing or just created <entry, LootTemplate>
// Adds current row to the template // Adds current row to the template
tab->second->AddEntry(storeitem); tab->second->AddEntry(storeitem);

6
src/game/Mail.cpp
View file

@ -113,7 +113,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
if (!rc) if (!rc)
{ {
DETAIL_LOG("Player %u is sending mail to %s (GUID: not existed!) with subject %s and body %s includes %u items, %u copper and %u COD copper with unk1 = %u, unk2 = %u", DETAIL_LOG("Player %u is sending mail to %s (GUID: nonexistent!) with subject %s and body %s includes %u items, %u copper and %u COD copper with unk1 = %u, unk2 = %u",
pl->GetGUIDLow(), receiver.c_str(), subject.c_str(), body.c_str(), items_count, money, COD, unk1, unk2); pl->GetGUIDLow(), receiver.c_str(), subject.c_str(), body.c_str(), items_count, money, COD, unk1, unk2);
pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_RECIPIENT_NOT_FOUND); pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_RECIPIENT_NOT_FOUND);
return; return;
@ -385,7 +385,7 @@ void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data )
CharacterDatabase.CommitTransaction(); CharacterDatabase.CommitTransaction();
pl->RemoveMail(mailId); pl->RemoveMail(mailId);
// send back only to existed players and simple drop for other cases // send back only to existing players and simple drop for other cases
if (m->messageType == MAIL_NORMAL && m->sender) if (m->messageType == MAIL_NORMAL && m->sender)
{ {
MailDraft draft(m->subject, m->body); MailDraft draft(m->subject, m->body);
@ -823,7 +823,7 @@ MailSender::MailSender( Object* sender, MailStationery stationery ) : m_statione
break; break;
default: default:
m_messageType = MAIL_NORMAL; m_messageType = MAIL_NORMAL;
m_senderId = 0; // will show mail from not existed player m_senderId = 0; // will show mail from nonexistent player
sLog.outError( "MailSender::MailSender - Mail have unexpected sender typeid (%u)", sender->GetTypeId()); sLog.outError( "MailSender::MailSender - Mail have unexpected sender typeid (%u)", sender->GetTypeId());
break; break;
} }

2
src/game/MotionMaster.cpp
View file

@ -375,7 +375,7 @@ MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode)
} }
else else
{ {
sLog.outError("%s attempt taxi to (not existed Path %u node %u)", sLog.outError("%s attempt taxi to (nonexistent Path %u node %u)",
i_owner->GetObjectGuid().GetString().c_str(), path, pathnode ); i_owner->GetObjectGuid().GetString().c_str(), path, pathnode );
} }
} }

2
src/game/Object.cpp
View file

@ -1050,7 +1050,7 @@ void Object::RemoveByteFlag( uint16 index, uint8 offset, uint8 oldFlag )
bool Object::PrintIndexError(uint32 index, bool set) const bool Object::PrintIndexError(uint32 index, bool set) const
{ {
sLog.outError("Attempt %s non-existed value field: %u (count: %u) for object typeid: %u type mask: %u",(set ? "set value to" : "get value from"),index,m_valuesCount,GetTypeId(),m_objectType); sLog.outError("Attempt %s nonexistent value field: %u (count: %u) for object typeid: %u type mask: %u",(set ? "set value to" : "get value from"),index,m_valuesCount,GetTypeId(),m_objectType);
// ASSERT must fail after function call // ASSERT must fail after function call
return false; return false;

64
src/game/ObjectMgr.cpp
View file

@ -1175,7 +1175,7 @@ void ObjectMgr::LoadCreatures()
MapEntry const* mapEntry = sMapStore.LookupEntry(data.mapid); MapEntry const* mapEntry = sMapStore.LookupEntry(data.mapid);
if(!mapEntry) if(!mapEntry)
{ {
sLog.outErrorDb("Table `creature` have creature (GUID: %u) that spawned at not existed map (Id: %u), skipped.",guid, data.mapid ); sLog.outErrorDb("Table `creature` have creature (GUID: %u) that spawned at nonexistent map (Id: %u), skipped.",guid, data.mapid );
continue; continue;
} }
@ -1384,7 +1384,7 @@ void ObjectMgr::LoadGameobjects()
MapEntry const* mapEntry = sMapStore.LookupEntry(data.mapid); MapEntry const* mapEntry = sMapStore.LookupEntry(data.mapid);
if(!mapEntry) if(!mapEntry)
{ {
sLog.outErrorDb("Table `gameobject` have gameobject (GUID: %u Entry: %u) that spawned at not existed map (Id: %u), skip", guid, data.id, data.mapid); sLog.outErrorDb("Table `gameobject` have gameobject (GUID: %u Entry: %u) that spawned at nonexistent map (Id: %u), skip", guid, data.id, data.mapid);
continue; continue;
} }
@ -1796,7 +1796,7 @@ void ObjectMgr::LoadItemPrototypes()
} }
else else
{ {
sLog.outErrorDb("Item (Entry: %u) not correct (not listed in list of existed items).",i); sLog.outErrorDb("Item (Entry: %u) not correct (not listed in list of existing items).",i);
} }
if(proto->Class >= MAX_ITEM_CLASS) if(proto->Class >= MAX_ITEM_CLASS)
@ -1881,7 +1881,7 @@ void ObjectMgr::LoadItemPrototypes()
if(proto->RequiredSpell && !sSpellStore.LookupEntry(proto->RequiredSpell)) if(proto->RequiredSpell && !sSpellStore.LookupEntry(proto->RequiredSpell))
{ {
sLog.outErrorDb("Item (Entry: %u) have wrong (non-existed) spell in RequiredSpell (%u)",i,proto->RequiredSpell); sLog.outErrorDb("Item (Entry: %u) have wrong (nonexistent) spell in RequiredSpell (%u)",i,proto->RequiredSpell);
const_cast<ItemPrototype*>(proto)->RequiredSpell = 0; const_cast<ItemPrototype*>(proto)->RequiredSpell = 0;
} }
@ -2846,7 +2846,7 @@ void ObjectMgr::LoadPlayerInfo()
// Fill gaps and check integrity // Fill gaps and check integrity
for (int class_ = 0; class_ < MAX_CLASSES; ++class_) for (int class_ = 0; class_ < MAX_CLASSES; ++class_)
{ {
// skip non existed classes // skip nonexistent classes
if(!sChrClassesStore.LookupEntry(class_)) if(!sChrClassesStore.LookupEntry(class_))
continue; continue;
@ -2948,13 +2948,13 @@ void ObjectMgr::LoadPlayerInfo()
// Fill gaps and check integrity // Fill gaps and check integrity
for (int race = 0; race < MAX_RACES; ++race) for (int race = 0; race < MAX_RACES; ++race)
{ {
// skip non existed races // skip nonexistent races
if(!sChrRacesStore.LookupEntry(race)) if(!sChrRacesStore.LookupEntry(race))
continue; continue;
for (int class_ = 0; class_ < MAX_CLASSES; ++class_) for (int class_ = 0; class_ < MAX_CLASSES; ++class_)
{ {
// skip non existed classes // skip nonexistent classes
if(!sChrClassesStore.LookupEntry(class_)) if(!sChrClassesStore.LookupEntry(class_))
continue; continue;
@ -3529,7 +3529,7 @@ void ObjectMgr::LoadQuests()
return; return;
} }
// create multimap previous quest for each existed quest // create multimap previous quest for each existing quest
// some quests can have many previous maps set by NextQuestId in previous quest // some quests can have many previous maps set by NextQuestId in previous quest
// for example set of race quests can lead to single not race specific quest // for example set of race quests can lead to single not race specific quest
barGoLink bar((int) result->GetRowCount() ); barGoLink bar((int) result->GetRowCount() );
@ -4525,7 +4525,7 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
{ {
if(!sSpellStore.LookupEntry(tmp.datalong)) if(!sSpellStore.LookupEntry(tmp.datalong))
{ {
sLog.outErrorDb("Table `%s` using non-existent spell (id: %u) in SCRIPT_COMMAND_REMOVE_AURA or SCRIPT_COMMAND_CAST_SPELL for script id %u", sLog.outErrorDb("Table `%s` using nonexistent spell (id: %u) in SCRIPT_COMMAND_REMOVE_AURA or SCRIPT_COMMAND_CAST_SPELL for script id %u",
tablename,tmp.datalong,tmp.id); tablename,tmp.datalong,tmp.id);
continue; continue;
} }
@ -4541,7 +4541,7 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
{ {
if(!sSpellStore.LookupEntry(tmp.datalong)) if(!sSpellStore.LookupEntry(tmp.datalong))
{ {
sLog.outErrorDb("Table `%s` using non-existent spell (id: %u) in SCRIPT_COMMAND_REMOVE_AURA or SCRIPT_COMMAND_CAST_SPELL for script id %u", sLog.outErrorDb("Table `%s` using nonexistent spell (id: %u) in SCRIPT_COMMAND_REMOVE_AURA or SCRIPT_COMMAND_CAST_SPELL for script id %u",
tablename,tmp.datalong,tmp.id); tablename,tmp.datalong,tmp.id);
continue; continue;
} }
@ -5670,7 +5670,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
ItemPrototype const *pProto = GetItemPrototype(at.requiredItem); ItemPrototype const *pProto = GetItemPrototype(at.requiredItem);
if (!pProto) if (!pProto)
{ {
sLog.outError("Table `areatrigger_teleport` has not existed key item %u for trigger %u, removing key requirement.", at.requiredItem, Trigger_ID); sLog.outError("Table `areatrigger_teleport` has nonexistent key item %u for trigger %u, removing key requirement.", at.requiredItem, Trigger_ID);
at.requiredItem = 0; at.requiredItem = 0;
} }
} }
@ -5680,7 +5680,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
ItemPrototype const *pProto = GetItemPrototype(at.requiredItem2); ItemPrototype const *pProto = GetItemPrototype(at.requiredItem2);
if(!pProto) if(!pProto)
{ {
sLog.outError("Table `areatrigger_teleport` has not existed second key item %u for trigger %u, remove key requirement.", at.requiredItem2, Trigger_ID); sLog.outError("Table `areatrigger_teleport` has nonexistent second key item %u for trigger %u, remove key requirement.", at.requiredItem2, Trigger_ID);
at.requiredItem2 = 0; at.requiredItem2 = 0;
} }
} }
@ -5690,7 +5690,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
ItemPrototype const *pProto = GetItemPrototype(at.heroicKey); ItemPrototype const *pProto = GetItemPrototype(at.heroicKey);
if (!pProto) if (!pProto)
{ {
sLog.outError("Table `areatrigger_teleport` has not existed heroic key item %u for trigger %u, remove key requirement.", at.heroicKey, Trigger_ID); sLog.outError("Table `areatrigger_teleport` has nonexistent heroic key item %u for trigger %u, remove key requirement.", at.heroicKey, Trigger_ID);
at.heroicKey = 0; at.heroicKey = 0;
} }
} }
@ -5700,7 +5700,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
ItemPrototype const *pProto = GetItemPrototype(at.heroicKey2); ItemPrototype const *pProto = GetItemPrototype(at.heroicKey2);
if (!pProto) if (!pProto)
{ {
sLog.outError("Table `areatrigger_teleport` has not existed heroic second key item %u for trigger %u, remove key requirement.", at.heroicKey2, Trigger_ID); sLog.outError("Table `areatrigger_teleport` has nonexistent heroic second key item %u for trigger %u, remove key requirement.", at.heroicKey2, Trigger_ID);
at.heroicKey2 = 0; at.heroicKey2 = 0;
} }
} }
@ -5710,7 +5710,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuest); QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuest);
if (qReqItr == mQuestTemplates.end()) if (qReqItr == mQuestTemplates.end())
{ {
sLog.outErrorDb("Table `areatrigger_teleport` has not existed required quest %u for trigger %u, remove quest done requirement.",at.requiredQuest,Trigger_ID); sLog.outErrorDb("Table `areatrigger_teleport` has nonexistent required quest %u for trigger %u, remove quest done requirement.",at.requiredQuest,Trigger_ID);
at.requiredQuest = 0; at.requiredQuest = 0;
} }
} }
@ -5720,7 +5720,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuestHeroic); QuestMap::iterator qReqItr = mQuestTemplates.find(at.requiredQuestHeroic);
if (qReqItr == mQuestTemplates.end()) if (qReqItr == mQuestTemplates.end())
{ {
sLog.outErrorDb("Table `areatrigger_teleport` has not existed required heroic quest %u for trigger %u, remove quest done requirement.",at.requiredQuestHeroic,Trigger_ID); sLog.outErrorDb("Table `areatrigger_teleport` has nonexistent required heroic quest %u for trigger %u, remove quest done requirement.",at.requiredQuestHeroic,Trigger_ID);
at.requiredQuestHeroic = 0; at.requiredQuestHeroic = 0;
} }
} }
@ -5728,7 +5728,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
MapEntry const* mapEntry = sMapStore.LookupEntry(at.target_mapId); MapEntry const* mapEntry = sMapStore.LookupEntry(at.target_mapId);
if (!mapEntry) if (!mapEntry)
{ {
sLog.outErrorDb("Table `areatrigger_teleport` has not existed target map (ID: %u) for Area trigger (ID:%u).", at.target_mapId, Trigger_ID); sLog.outErrorDb("Table `areatrigger_teleport` has nonexistent target map (ID: %u) for Area trigger (ID:%u).", at.target_mapId, Trigger_ID);
continue; continue;
} }
@ -5863,7 +5863,7 @@ void ObjectMgr::SetHighestGuids()
delete result; delete result;
} }
// Cleanup other tables from not existed guids (>=m_hiItemGuid) // Cleanup other tables from nonexistent guids (>=m_hiItemGuid)
CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item >= '%u'", m_ItemGuids.GetNextAfterMaxUsed()); CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item >= '%u'", m_ItemGuids.GetNextAfterMaxUsed());
CharacterDatabase.PExecute("DELETE FROM mail_items WHERE item_guid >= '%u'", m_ItemGuids.GetNextAfterMaxUsed()); CharacterDatabase.PExecute("DELETE FROM mail_items WHERE item_guid >= '%u'", m_ItemGuids.GetNextAfterMaxUsed());
CharacterDatabase.PExecute("DELETE FROM auction WHERE itemguid >= '%u'", m_ItemGuids.GetNextAfterMaxUsed()); CharacterDatabase.PExecute("DELETE FROM auction WHERE itemguid >= '%u'", m_ItemGuids.GetNextAfterMaxUsed());
@ -6046,7 +6046,7 @@ inline void CheckGOLinkedTrapId(GameObjectInfo const* goInfo,uint32 dataN,uint32
goInfo->id,goInfo->type,N,dataN,dataN,GAMEOBJECT_TYPE_TRAP); goInfo->id,goInfo->type,N,dataN,dataN,GAMEOBJECT_TYPE_TRAP);
} }
else else
// too many error reports about not existed trap templates // too many error reports about nonexistent trap templates
ERROR_DB_STRICT_LOG("Gameobject (Entry: %u GoType: %u) have data%d=%u but trap GO (Entry %u) not exist in `gameobject_template`.", ERROR_DB_STRICT_LOG("Gameobject (Entry: %u GoType: %u) have data%d=%u but trap GO (Entry %u) not exist in `gameobject_template`.",
goInfo->id,goInfo->type,N,dataN,dataN); goInfo->id,goInfo->type,N,dataN,dataN);
} }
@ -6154,7 +6154,7 @@ void ObjectMgr::LoadGameobjectInfo()
{ {
if (goInfo->trap.lockId) if (goInfo->trap.lockId)
CheckGOLockId(goInfo,goInfo->trap.lockId,0); CheckGOLockId(goInfo,goInfo->trap.lockId,0);
/* disable check for while, too many not existed spells /* disable check for while, too many nonexistent spells
if (goInfo->trap.spellId) // spell if (goInfo->trap.spellId) // spell
CheckGOSpellId(goInfo,goInfo->trap.spellId,3); CheckGOSpellId(goInfo,goInfo->trap.spellId,3);
*/ */
@ -6189,7 +6189,7 @@ void ObjectMgr::LoadGameobjectInfo()
sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) have data7=%u but PageText (Entry %u) not exist.", sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) have data7=%u but PageText (Entry %u) not exist.",
id,goInfo->type,goInfo->goober.pageId,goInfo->goober.pageId); id,goInfo->type,goInfo->goober.pageId,goInfo->goober.pageId);
} }
/* disable check for while, too many not existed spells /* disable check for while, too many nonexistent spells
if (goInfo->goober.spellId) // spell if (goInfo->goober.spellId) // spell
CheckGOSpellId(goInfo,goInfo->goober.spellId,10); CheckGOSpellId(goInfo,goInfo->goober.spellId,10);
*/ */
@ -6222,7 +6222,7 @@ void ObjectMgr::LoadGameobjectInfo()
} }
case GAMEOBJECT_TYPE_SUMMONING_RITUAL: //18 case GAMEOBJECT_TYPE_SUMMONING_RITUAL: //18
{ {
/* disable check for while, too many not existed spells /* disable check for while, too many nonexistent spells
// always must have spell // always must have spell
CheckGOSpellId(goInfo,goInfo->summoningRitual.spellId,1); CheckGOSpellId(goInfo,goInfo->summoningRitual.spellId,1);
*/ */
@ -6549,7 +6549,7 @@ void ObjectMgr::LoadReputationOnKill()
if(!GetCreatureTemplate(creature_id)) if(!GetCreatureTemplate(creature_id))
{ {
sLog.outErrorDb("Table `creature_onkill_reputation` have data for not existed creature entry (%u), skipped",creature_id); sLog.outErrorDb("Table `creature_onkill_reputation` have data for nonexistent creature entry (%u), skipped",creature_id);
continue; continue;
} }
@ -7119,7 +7119,7 @@ void ObjectMgr::LoadGameobjectQuestRelations()
{ {
GameObjectInfo const* goInfo = GetGameObjectInfo(itr->first); GameObjectInfo const* goInfo = GetGameObjectInfo(itr->first);
if(!goInfo) if(!goInfo)
sLog.outErrorDb("Table `gameobject_questrelation` have data for not existed gameobject entry (%u) and existed quest %u",itr->first,itr->second); sLog.outErrorDb("Table `gameobject_questrelation` have data for nonexistent gameobject entry (%u) and existing quest %u",itr->first,itr->second);
else if(goInfo->type != GAMEOBJECT_TYPE_QUESTGIVER) else if(goInfo->type != GAMEOBJECT_TYPE_QUESTGIVER)
sLog.outErrorDb("Table `gameobject_questrelation` have data gameobject entry (%u) for quest %u, but GO is not GAMEOBJECT_TYPE_QUESTGIVER",itr->first,itr->second); sLog.outErrorDb("Table `gameobject_questrelation` have data gameobject entry (%u) for quest %u, but GO is not GAMEOBJECT_TYPE_QUESTGIVER",itr->first,itr->second);
} }
@ -7133,7 +7133,7 @@ void ObjectMgr::LoadGameobjectInvolvedRelations()
{ {
GameObjectInfo const* goInfo = GetGameObjectInfo(itr->first); GameObjectInfo const* goInfo = GetGameObjectInfo(itr->first);
if(!goInfo) if(!goInfo)
sLog.outErrorDb("Table `gameobject_involvedrelation` have data for not existed gameobject entry (%u) and existed quest %u",itr->first,itr->second); sLog.outErrorDb("Table `gameobject_involvedrelation` have data for nonexistent gameobject entry (%u) and existing quest %u",itr->first,itr->second);
else if(goInfo->type != GAMEOBJECT_TYPE_QUESTGIVER) else if(goInfo->type != GAMEOBJECT_TYPE_QUESTGIVER)
sLog.outErrorDb("Table `gameobject_involvedrelation` have data gameobject entry (%u) for quest %u, but GO is not GAMEOBJECT_TYPE_QUESTGIVER",itr->first,itr->second); sLog.outErrorDb("Table `gameobject_involvedrelation` have data gameobject entry (%u) for quest %u, but GO is not GAMEOBJECT_TYPE_QUESTGIVER",itr->first,itr->second);
} }
@ -7147,7 +7147,7 @@ void ObjectMgr::LoadCreatureQuestRelations()
{ {
CreatureInfo const* cInfo = GetCreatureTemplate(itr->first); CreatureInfo const* cInfo = GetCreatureTemplate(itr->first);
if(!cInfo) if(!cInfo)
sLog.outErrorDb("Table `creature_questrelation` have data for not existed creature entry (%u) and existed quest %u",itr->first,itr->second); sLog.outErrorDb("Table `creature_questrelation` have data for nonexistent creature entry (%u) and existing quest %u",itr->first,itr->second);
else if(!(cInfo->npcflag & UNIT_NPC_FLAG_QUESTGIVER)) else if(!(cInfo->npcflag & UNIT_NPC_FLAG_QUESTGIVER))
sLog.outErrorDb("Table `creature_questrelation` has creature entry (%u) for quest %u, but npcflag does not include UNIT_NPC_FLAG_QUESTGIVER",itr->first,itr->second); sLog.outErrorDb("Table `creature_questrelation` has creature entry (%u) for quest %u, but npcflag does not include UNIT_NPC_FLAG_QUESTGIVER",itr->first,itr->second);
} }
@ -7161,7 +7161,7 @@ void ObjectMgr::LoadCreatureInvolvedRelations()
{ {
CreatureInfo const* cInfo = GetCreatureTemplate(itr->first); CreatureInfo const* cInfo = GetCreatureTemplate(itr->first);
if(!cInfo) if(!cInfo)
sLog.outErrorDb("Table `creature_involvedrelation` have data for not existed creature entry (%u) and existed quest %u",itr->first,itr->second); sLog.outErrorDb("Table `creature_involvedrelation` have data for nonexistent creature entry (%u) and existing quest %u",itr->first,itr->second);
else if(!(cInfo->npcflag & UNIT_NPC_FLAG_QUESTGIVER)) else if(!(cInfo->npcflag & UNIT_NPC_FLAG_QUESTGIVER))
sLog.outErrorDb("Table `creature_involvedrelation` has creature entry (%u) for quest %u, but npcflag does not include UNIT_NPC_FLAG_QUESTGIVER",itr->first,itr->second); sLog.outErrorDb("Table `creature_involvedrelation` has creature entry (%u) for quest %u, but npcflag does not include UNIT_NPC_FLAG_QUESTGIVER",itr->first,itr->second);
} }
@ -7943,7 +7943,7 @@ bool PlayerCondition::IsValid(ConditionType condition, uint32 value1, uint32 val
GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap(); GameEventMgr::GameEventDataMap const& events = sGameEventMgr.GetEventMap();
if (value1 >=events.size() || !events[value1].isValid()) if (value1 >=events.size() || !events[value1].isValid())
{ {
sLog.outErrorDb("Active event (%u) condition requires existed event id (%u), skipped", condition, value1); sLog.outErrorDb("Active event (%u) condition requires existing event id (%u), skipped", condition, value1);
return false; return false;
} }
break; break;
@ -8015,7 +8015,7 @@ bool PlayerCondition::IsValid(ConditionType condition, uint32 value1, uint32 val
MapEntry const* mapEntry = sMapStore.LookupEntry(value1); MapEntry const* mapEntry = sMapStore.LookupEntry(value1);
if (!mapEntry || !mapEntry->IsDungeon()) if (!mapEntry || !mapEntry->IsDungeon())
{ {
sLog.outErrorDb("Instance script condition (%u) has not existed map id %u as first arg, skipped", condition, value1); sLog.outErrorDb("Instance script condition (%u) has nonexistent map id %u as first arg, skipped", condition, value1);
return false; return false;
} }
@ -8255,7 +8255,7 @@ void ObjectMgr::LoadMailLevelRewards()
if(!GetCreatureTemplateStore(senderEntry)) if(!GetCreatureTemplateStore(senderEntry))
{ {
sLog.outErrorDb("Table `mail_level_reward` have not existed sender creature entry (%u) for level %u that invalid not include any player races, ignoring.",senderEntry,level); sLog.outErrorDb("Table `mail_level_reward` have nonexistent sender creature entry (%u) for level %u that invalid not include any player races, ignoring.",senderEntry,level);
continue; continue;
} }
@ -8310,7 +8310,7 @@ void ObjectMgr::LoadTrainerSpell()
if(!cInfo) if(!cInfo)
{ {
sLog.outErrorDb("Table `npc_trainer` have entry for not existed creature template (Entry: %u), ignore", entry); sLog.outErrorDb("Table `npc_trainer` have entry for nonexistent creature template (Entry: %u), ignore", entry);
continue; continue;
} }
@ -8466,7 +8466,7 @@ void ObjectMgr::LoadNpcTextId()
if (!GetCreatureData(guid)) if (!GetCreatureData(guid))
{ {
sLog.outErrorDb("Table `npc_gossip` have not existed creature (GUID: %u) entry, ignore. ",guid); sLog.outErrorDb("Table `npc_gossip` have nonexistent creature (GUID: %u) entry, ignore. ",guid);
continue; continue;
} }
if (!GetGossipText(textid)) if (!GetGossipText(textid))

4
src/game/Pet.cpp
View file

@ -1295,11 +1295,11 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel
// do pet spell book cleanup // do pet spell book cleanup
if(state == PETSPELL_UNCHANGED) // spell load case if(state == PETSPELL_UNCHANGED) // spell load case
{ {
sLog.outError("Pet::addSpell: Non-existed in SpellStore spell #%u request, deleting for all pets in `pet_spell`.",spell_id); sLog.outError("Pet::addSpell: nonexistent in SpellStore spell #%u request, deleting for all pets in `pet_spell`.",spell_id);
CharacterDatabase.PExecute("DELETE FROM pet_spell WHERE spell = '%u'",spell_id); CharacterDatabase.PExecute("DELETE FROM pet_spell WHERE spell = '%u'",spell_id);
} }
else else
sLog.outError("Pet::addSpell: Non-existed in SpellStore spell #%u request.",spell_id); sLog.outError("Pet::addSpell: nonexistent in SpellStore spell #%u request.",spell_id);
return false; return false;
} }

34
src/game/Player.cpp
View file

@ -186,7 +186,7 @@ void PlayerTaxi::LoadTaxiMask(const char* data)
for (iter = tokens.begin(), index = 0; for (iter = tokens.begin(), index = 0;
(index < TaxiMaskSize) && (iter != tokens.end()); ++iter, ++index) (index < TaxiMaskSize) && (iter != tokens.end()); ++iter, ++index)
{ {
// load and set bits only for existed taxi nodes // load and set bits only for existing taxi nodes
m_taximask[index] = sTaxiNodesMask[index] & uint32(atol((*iter).c_str())); m_taximask[index] = sTaxiNodesMask[index] & uint32(atol((*iter).c_str()));
} }
} }
@ -196,7 +196,7 @@ void PlayerTaxi::AppendTaximaskTo( ByteBuffer& data, bool all )
if(all) if(all)
{ {
for (uint8 i=0; i<TaxiMaskSize; ++i) for (uint8 i=0; i<TaxiMaskSize; ++i)
data << uint32(sTaxiNodesMask[i]); // all existed nodes data << uint32(sTaxiNodesMask[i]); // all existing nodes
} }
else else
{ {
@ -2977,11 +2977,11 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
// do character spell book cleanup (all characters) // do character spell book cleanup (all characters)
if(!IsInWorld() && !learning) // spell load case if(!IsInWorld() && !learning) // spell load case
{ {
sLog.outError("Player::addSpell: Non-existed in SpellStore spell #%u request, deleting for all characters in `character_spell`.",spell_id); sLog.outError("Player::addSpell: nonexistent in SpellStore spell #%u request, deleting for all characters in `character_spell`.",spell_id);
CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = '%u'",spell_id); CharacterDatabase.PExecute("DELETE FROM character_spell WHERE spell = '%u'",spell_id);
} }
else else
sLog.outError("Player::addSpell: Non-existed in SpellStore spell #%u request.",spell_id); sLog.outError("Player::addSpell: nonexistent in SpellStore spell #%u request.",spell_id);
return false; return false;
} }
@ -4149,7 +4149,7 @@ TrainerSpellState Player::GetTrainerSpellState(TrainerSpell const* trainer_spell
*/ */
void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmChars, bool deleteFinally) void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmChars, bool deleteFinally)
{ {
// for not existed account avoid update realm // for nonexistent account avoid update realm
if (accountId == 0) if (accountId == 0)
updateRealmChars = false; updateRealmChars = false;
@ -4983,7 +4983,7 @@ void Player::HandleBaseModValue(BaseModGroup modGroup, BaseModType modType, floa
{ {
if(modGroup >= BASEMOD_END || modType >= MOD_END) if(modGroup >= BASEMOD_END || modType >= MOD_END)
{ {
sLog.outError("ERROR in HandleBaseModValue(): non existed BaseModGroup of wrong BaseModType!"); sLog.outError("ERROR in HandleBaseModValue(): nonexistent BaseModGroup of wrong BaseModType!");
return; return;
} }
@ -5020,7 +5020,7 @@ float Player::GetBaseModValue(BaseModGroup modGroup, BaseModType modType) const
{ {
if(modGroup >= BASEMOD_END || modType > MOD_END) if(modGroup >= BASEMOD_END || modType > MOD_END)
{ {
sLog.outError("trial to access non existed BaseModGroup or wrong BaseModType!"); sLog.outError("trial to access nonexistent BaseModGroup or wrong BaseModType!");
return 0.0f; return 0.0f;
} }
@ -5979,7 +5979,7 @@ ActionButton* Player::addActionButton(uint8 spec, uint8 button, uint32 action, u
if (spec == GetActiveSpec() && !IsActionButtonDataValid(button,action,type,this)) if (spec == GetActiveSpec() && !IsActionButtonDataValid(button,action,type,this))
return NULL; return NULL;
// it create new button (NEW state) if need or return existed // it create new button (NEW state) if need or return existing
ActionButton& ab = m_actionButtons[spec][button]; ActionButton& ab = m_actionButtons[spec][button];
// set data and update to CHANGED if not NEW // set data and update to CHANGED if not NEW
@ -9462,7 +9462,7 @@ uint8 Player::_CanStoreItem_InBag( uint8 bag, ItemPosCountVec &dest, ItemPrototy
if (bag==skip_bag) if (bag==skip_bag)
return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG; return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
// skip not existed bag or self targeted bag // skip nonexistent bag or self targeted bag
Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag ); Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag );
if (!pBag || pBag==pSrcItem) if (!pBag || pBag==pSrcItem)
return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG; return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
@ -10423,7 +10423,7 @@ uint8 Player::CanUnequipItem( uint16 pos, bool swap ) const
Item* pItem = GetItemByPos(pos); Item* pItem = GetItemByPos(pos);
// Applied only to existed equipped item // Applied only to existing equipped item
if( !pItem ) if( !pItem )
return EQUIP_ERR_OK; return EQUIP_ERR_OK;
@ -11244,7 +11244,7 @@ void Player::MoveItemToInventory(ItemPosCountVec const& dest, Item* pItem, bool
// store item // store item
Item* pLastItem = StoreItem(dest, pItem, update); Item* pLastItem = StoreItem(dest, pItem, update);
// only set if not merged to existed stack (pItem can be deleted already but we can compare pointers any way) // only set if not merged to existing stack (pItem can be deleted already but we can compare pointers any way)
if(pLastItem == pItem) if(pLastItem == pItem)
{ {
// update owner for last item (this can be original item with wrong owner // update owner for last item (this can be original item with wrong owner
@ -11576,7 +11576,7 @@ void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
return; return;
} }
// not let split more existed items (can be only at cheating) // not let split more existing items (can be only at cheating)
if(pSrcItem->GetCount() < count) if(pSrcItem->GetCount() < count)
{ {
SendEquipError( EQUIP_ERR_TRIED_TO_SPLIT_MORE_THAN_COUNT, pSrcItem, NULL ); SendEquipError( EQUIP_ERR_TRIED_TO_SPLIT_MORE_THAN_COUNT, pSrcItem, NULL );
@ -16026,7 +16026,7 @@ void Player::_LoadMails(QueryResult *result)
if(m->mailTemplateId && !sMailTemplateStore.LookupEntry(m->mailTemplateId)) if(m->mailTemplateId && !sMailTemplateStore.LookupEntry(m->mailTemplateId))
{ {
sLog.outError( "Player::_LoadMail - Mail (%u) have not existed MailTemplateId (%u), remove at load", m->messageID, m->mailTemplateId); sLog.outError( "Player::_LoadMail - Mail (%u) have nonexistent MailTemplateId (%u), remove at load", m->messageID, m->mailTemplateId);
m->mailTemplateId = 0; m->mailTemplateId = 0;
} }
@ -16381,14 +16381,14 @@ void Player::_LoadBoundInstances(QueryResult *result)
MapEntry const* mapEntry = sMapStore.LookupEntry(mapId); MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
if(!mapEntry || !mapEntry->IsDungeon()) if(!mapEntry || !mapEntry->IsDungeon())
{ {
sLog.outError("_LoadBoundInstances: player %s(%d) has bind to not existed or not dungeon map %d", GetName(), GetGUIDLow(), mapId); sLog.outError("_LoadBoundInstances: player %s(%d) has bind to nonexistent or not dungeon map %d", GetName(), GetGUIDLow(), mapId);
CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%d' AND instance = '%d'", GetGUIDLow(), instanceId); CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%d' AND instance = '%d'", GetGUIDLow(), instanceId);
continue; continue;
} }
if(difficulty >= MAX_DIFFICULTY) if(difficulty >= MAX_DIFFICULTY)
{ {
sLog.outError("_LoadBoundInstances: player %s(%d) has bind to not existed difficulty %d instance for map %u", GetName(), GetGUIDLow(), difficulty, mapId); sLog.outError("_LoadBoundInstances: player %s(%d) has bind to nonexistent difficulty %d instance for map %u", GetName(), GetGUIDLow(), difficulty, mapId);
CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%d' AND instance = '%d'", GetGUIDLow(), instanceId); CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%d' AND instance = '%d'", GetGUIDLow(), instanceId);
continue; continue;
} }
@ -16396,7 +16396,7 @@ void Player::_LoadBoundInstances(QueryResult *result)
MapDifficulty const* mapDiff = GetMapDifficultyData(mapId,Difficulty(difficulty)); MapDifficulty const* mapDiff = GetMapDifficultyData(mapId,Difficulty(difficulty));
if(!mapDiff) if(!mapDiff)
{ {
sLog.outError("_LoadBoundInstances: player %s(%d) has bind to not existed difficulty %d instance for map %u", GetName(), GetGUIDLow(), difficulty, mapId); sLog.outError("_LoadBoundInstances: player %s(%d) has bind to nonexistent difficulty %d instance for map %u", GetName(), GetGUIDLow(), difficulty, mapId);
CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%d' AND instance = '%d'", GetGUIDLow(), instanceId); CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%d' AND instance = '%d'", GetGUIDLow(), instanceId);
continue; continue;
} }
@ -18913,7 +18913,7 @@ void Player::UpdatePotionCooldown(Spell* spell)
// Call not from spell cast, send cooldown event for item spells if no in combat // Call not from spell cast, send cooldown event for item spells if no in combat
if(!spell) if(!spell)
{ {
// spell/item pair let set proper cooldown (except not existed charged spell cooldown spellmods for potions) // spell/item pair let set proper cooldown (except nonexistent charged spell cooldown spellmods for potions)
if(ItemPrototype const* proto = ObjectMgr::GetItemPrototype(m_lastPotionId)) if(ItemPrototype const* proto = ObjectMgr::GetItemPrototype(m_lastPotionId))
for(int idx = 0; idx < 5; ++idx) for(int idx = 0; idx < 5; ++idx)
if(proto->Spells[idx].SpellId && proto->Spells[idx].SpellTrigger == ITEM_SPELLTRIGGER_ON_USE) if(proto->Spells[idx].SpellId && proto->Spells[idx].SpellTrigger == ITEM_SPELLTRIGGER_ON_USE)

2
src/game/PoolManager.cpp
View file

@ -407,7 +407,7 @@ void PoolGroup<GameObject>::Spawn1Object(PoolObject* obj, bool instantly)
{ {
sObjectMgr.AddGameobjectToGrid(obj->guid, data); sObjectMgr.AddGameobjectToGrid(obj->guid, data);
// Spawn if necessary (loaded grids only) // Spawn if necessary (loaded grids only)
// this base map checked as non-instanced and then only existed // this base map checked as non-instanced and then only existing
Map* map = const_cast<Map*>(sMapMgr.CreateBaseMap(data->mapid)); Map* map = const_cast<Map*>(sMapMgr.CreateBaseMap(data->mapid));
// We use current coords to unspawn, not spawn coords since creature can have changed grid // We use current coords to unspawn, not spawn coords since creature can have changed grid
// (avoid work for instances until implemented support) // (avoid work for instances until implemented support)

2
src/game/SkillDiscovery.cpp
View file

@ -91,7 +91,7 @@ void LoadSkillDiscoveryTable()
{ {
if (reportedReqSpells.find(reqSkillOrSpell) == reportedReqSpells.end()) if (reportedReqSpells.find(reqSkillOrSpell) == reportedReqSpells.end())
{ {
sLog.outErrorDb("Spell (ID: %u) have not existed spell (ID: %i) in `reqSpell` field in `skill_discovery_template` table",spellId,reqSkillOrSpell); sLog.outErrorDb("Spell (ID: %u) have nonexistent spell (ID: %i) in `reqSpell` field in `skill_discovery_template` table",spellId,reqSkillOrSpell);
reportedReqSpells.insert(reqSkillOrSpell); reportedReqSpells.insert(reqSkillOrSpell);
} }
continue; continue;

4
src/game/SkillExtraItems.cpp
View file

@ -72,14 +72,14 @@ void LoadSkillExtraItemTable()
if(!sSpellStore.LookupEntry(spellId)) if(!sSpellStore.LookupEntry(spellId))
{ {
sLog.outError("Skill specialization %u has non-existent spell id in `skill_extra_item_template`!", spellId); sLog.outError("Skill specialization %u has nonexistent spell id in `skill_extra_item_template`!", spellId);
continue; continue;
} }
uint32 requiredSpecialization = fields[1].GetUInt32(); uint32 requiredSpecialization = fields[1].GetUInt32();
if(!sSpellStore.LookupEntry(requiredSpecialization)) if(!sSpellStore.LookupEntry(requiredSpecialization))
{ {
sLog.outError("Skill specialization %u have not existed required specialization spell id %u in `skill_extra_item_template`!", spellId,requiredSpecialization); sLog.outError("Skill specialization %u have nonexistent required specialization spell id %u in `skill_extra_item_template`!", spellId,requiredSpecialization);
continue; continue;
} }

4
src/game/Spell.cpp
View file

@ -547,7 +547,7 @@ void Spell::FillTargetMap()
{ {
case TARGET_ALL_ENEMY_IN_AREA: case TARGET_ALL_ENEMY_IN_AREA:
// Note: this hack with search required until GO casting not implemented // Note: this hack with search required until GO casting not implemented
// environment damage spells already have around enemies targeting but this not help in case not existed GO casting support // environment damage spells already have around enemies targeting but this not help in case nonexistent GO casting support
// currently each enemy selected explicitly and self cast damage // currently each enemy selected explicitly and self cast damage
if (m_spellInfo->Effect[i] == SPELL_EFFECT_ENVIRONMENTAL_DAMAGE) if (m_spellInfo->Effect[i] == SPELL_EFFECT_ENVIRONMENTAL_DAMAGE)
{ {
@ -2741,7 +2741,7 @@ void Spell::cast(bool skipCheck)
return; return;
} }
// update pointers base at GUIDs to prevent access to non-existed already object // update pointers base at GUIDs to prevent access to already nonexistent object
UpdatePointers(); UpdatePointers();
// cancel at lost main target unit // cancel at lost main target unit

2
src/game/SpellAuras.cpp
View file

@ -7952,7 +7952,7 @@ void SpellAuraHolder::_RemoveSpellAuraHolder()
if(caster && caster->GetTypeId() == TYPEID_PLAYER) if(caster && caster->GetTypeId() == TYPEID_PLAYER)
{ {
if ( GetSpellProto()->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE ) if ( GetSpellProto()->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE )
// note: item based cooldowns and cooldown spell mods with charges ignored (unknown existed cases) // note: item based cooldowns and cooldown spell mods with charges ignored (unknown existing cases)
((Player*)caster)->SendCooldownEvent(GetSpellProto()); ((Player*)caster)->SendCooldownEvent(GetSpellProto());
} }
} }

10
src/game/SpellEffects.cpp
View file

@ -281,7 +281,7 @@ void Spell::EffectEnvironmentalDMG(SpellEffectIndex eff_idx)
uint32 resist = 0; uint32 resist = 0;
// Note: this hack with damage replace required until GO casting not implemented // Note: this hack with damage replace required until GO casting not implemented
// environment damage spells already have around enemies targeting but this not help in case not existed GO casting support // environment damage spells already have around enemies targeting but this not help in case nonexistent GO casting support
// currently each enemy selected explicitly and self cast damage, we prevent apply self casted spell bonuses/etc // currently each enemy selected explicitly and self cast damage, we prevent apply self casted spell bonuses/etc
damage = m_spellInfo->CalculateSimpleValue(eff_idx); damage = m_spellInfo->CalculateSimpleValue(eff_idx);
@ -2491,7 +2491,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
int32 bp = int32(count * m_caster->GetMaxHealth() * m_spellInfo->DmgMultiplier[EFFECT_INDEX_0] / 100); int32 bp = int32(count * m_caster->GetMaxHealth() * m_spellInfo->DmgMultiplier[EFFECT_INDEX_0] / 100);
// Improved Death Strike (percent stored in not existed EFFECT_INDEX_2 effect base points) // Improved Death Strike (percent stored in nonexistent EFFECT_INDEX_2 effect base points)
Unit::AuraList const& auraMod = m_caster->GetAurasByType(SPELL_AURA_ADD_FLAT_MODIFIER); Unit::AuraList const& auraMod = m_caster->GetAurasByType(SPELL_AURA_ADD_FLAT_MODIFIER);
for(Unit::AuraList::const_iterator iter = auraMod.begin(); iter != auraMod.end(); ++iter) for(Unit::AuraList::const_iterator iter = auraMod.begin(); iter != auraMod.end(); ++iter)
{ {
@ -3356,7 +3356,7 @@ void Spell::DoCreateItem(SpellEffectIndex eff_idx, uint32 itemtype)
num_to_add -= no_space; num_to_add -= no_space;
else else
{ {
// ignore mana gem case (next effect will recharge existed example) // ignore mana gem case (next effect will recharge existing example)
if (eff_idx == EFFECT_INDEX_0 && m_spellInfo->Effect[EFFECT_INDEX_1] == SPELL_EFFECT_DUMMY ) if (eff_idx == EFFECT_INDEX_0 && m_spellInfo->Effect[EFFECT_INDEX_1] == SPELL_EFFECT_DUMMY )
return; return;
@ -3392,7 +3392,7 @@ void Spell::DoCreateItem(SpellEffectIndex eff_idx, uint32 itemtype)
} }
// for battleground marks send by mail if not add all expected // for battleground marks send by mail if not add all expected
// FIXME: single existed bg marks for outfield bg and we not have it.. // FIXME: single existing bg marks for outfield bg and we not have it..
/* /*
if(no_space > 0 && bg_mark) if(no_space > 0 && bg_mark)
{ {
@ -4681,7 +4681,7 @@ void Spell::EffectEnchantItemTmp(SpellEffectIndex eff_idx)
SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id); SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
if(!pEnchant) if(!pEnchant)
{ {
sLog.outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have not existed enchanting id %u ",m_spellInfo->Id,eff_idx,enchant_id); sLog.outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have nonexistent enchanting id %u ",m_spellInfo->Id,eff_idx,enchant_id);
return; return;
} }

10
src/game/SpellMgr.cpp
View file

@ -1380,7 +1380,7 @@ void SpellMgr::LoadSpellBonuses()
bool need_dot = false; bool need_dot = false;
bool need_direct = false; bool need_direct = false;
uint32 x = 0; // count all, including empty, meaning: not all existed effect is DoTs/HoTs uint32 x = 0; // count all, including empty, meaning: not all existing effect is DoTs/HoTs
for(int i = 0; i < MAX_EFFECT_INDEX; ++i) for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
{ {
if (!spell->Effect[i]) if (!spell->Effect[i])
@ -2384,7 +2384,7 @@ void SpellMgr::LoadSpellChains()
if(node.prev!=0 && !sSpellStore.LookupEntry(node.prev)) if(node.prev!=0 && !sSpellStore.LookupEntry(node.prev))
{ {
sLog.outErrorDb("Spell %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has not existed previous rank spell.", sLog.outErrorDb("Spell %u (prev: %u, first: %u, rank: %d, req: %u) listed in `spell_chain` has nonexistent previous rank spell.",
spell_id,node.prev,node.first,node.rank,node.req); spell_id,node.prev,node.first,node.rank,node.req);
continue; continue;
} }
@ -2599,7 +2599,7 @@ void SpellMgr::LoadSpellLearnSpells()
if (!sSpellStore.LookupEntry(node.spell)) if (!sSpellStore.LookupEntry(node.spell))
{ {
sLog.outErrorDb("Spell %u listed in `spell_learn_spell` learning not existed spell %u",spell_id,node.spell); sLog.outErrorDb("Spell %u listed in `spell_learn_spell` learning nonexistent spell %u",spell_id,node.spell);
continue; continue;
} }
@ -2633,7 +2633,7 @@ void SpellMgr::LoadSpellLearnSpells()
dbc_node.spell = entry->EffectTriggerSpell[i]; dbc_node.spell = entry->EffectTriggerSpell[i];
dbc_node.active = true; // all dbc based learned spells is active (show in spell book or hide by client itself) dbc_node.active = true; // all dbc based learned spells is active (show in spell book or hide by client itself)
// ignore learning not existed spells (broken/outdated/or generic learnig spell 483 // ignore learning nonexistent spells (broken/outdated/or generic learnig spell 483
if (!sSpellStore.LookupEntry(dbc_node.spell)) if (!sSpellStore.LookupEntry(dbc_node.spell))
continue; continue;
@ -3072,7 +3072,7 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg)
case 0: case 0:
continue; continue;
// craft spell for crafting non-existed item (break client recipes list show) // craft spell for crafting nonexistent item (break client recipes list show)
case SPELL_EFFECT_CREATE_ITEM: case SPELL_EFFECT_CREATE_ITEM:
case SPELL_EFFECT_CREATE_ITEM_2: case SPELL_EFFECT_CREATE_ITEM_2:
{ {

2
src/game/TotemAI.cpp
View file

@ -68,7 +68,7 @@ TotemAI::UpdateAI(const uint32 /*diff*/)
SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->rangeIndex); SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->rangeIndex);
float max_range = GetSpellMaxRange(srange); float max_range = GetSpellMaxRange(srange);
// SPELLMOD_RANGE not applied in this place just because not existence range mods for attacking totems // SPELLMOD_RANGE not applied in this place just because nonexistent range mods for attacking totems
// pointer to appropriate target if found any // pointer to appropriate target if found any
Unit* victim = i_victimGuid ? ObjectAccessor::GetUnit(*m_creature, i_victimGuid) : NULL; Unit* victim = i_victimGuid ? ObjectAccessor::GetUnit(*m_creature, i_victimGuid) : NULL;

14
src/game/Unit.cpp
View file

@ -2213,7 +2213,7 @@ void Unit::CalculateAbsorbAndResist(Unit *pCaster, SpellSchoolMask schoolMask, D
if (Aura* spdAura = GetAura(44413, EFFECT_INDEX_0)) if (Aura* spdAura = GetAura(44413, EFFECT_INDEX_0))
amount += spdAura->GetModifier()->m_amount * spdAura->GetAuraDuration() / spdAura->GetAuraMaxDuration(); amount += spdAura->GetModifier()->m_amount * spdAura->GetAuraDuration() / spdAura->GetAuraMaxDuration();
// Incanter's Absorption (triggered absorb based spell power, will replace existed if any) // Incanter's Absorption (triggered absorb based spell power, will replace existing if any)
CastCustomSpell(this, 44413, &amount, NULL, NULL, true); CastCustomSpell(this, 44413, &amount, NULL, NULL, true);
break; break;
} }
@ -4852,7 +4852,7 @@ void Unit::AddGameObject(GameObject* gameObj)
SpellEntry const* createBySpell = sSpellStore.LookupEntry(gameObj->GetSpellId()); SpellEntry const* createBySpell = sSpellStore.LookupEntry(gameObj->GetSpellId());
// Need disable spell use for owner // Need disable spell use for owner
if (createBySpell && createBySpell->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE) if (createBySpell && createBySpell->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE)
// note: item based cooldowns and cooldown spell mods with charges ignored (unknown existed cases) // note: item based cooldowns and cooldown spell mods with charges ignored (unknown existing cases)
((Player*)this)->AddSpellAndCategoryCooldowns(createBySpell,0,NULL,true); ((Player*)this)->AddSpellAndCategoryCooldowns(createBySpell,0,NULL,true);
} }
} }
@ -4873,7 +4873,7 @@ void Unit::RemoveGameObject(GameObject* gameObj, bool del)
SpellEntry const* createBySpell = sSpellStore.LookupEntry(spellid ); SpellEntry const* createBySpell = sSpellStore.LookupEntry(spellid );
// Need activate spell use for owner // Need activate spell use for owner
if (createBySpell && createBySpell->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE) if (createBySpell && createBySpell->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE)
// note: item based cooldowns and cooldown spell mods with charges ignored (unknown existed cases) // note: item based cooldowns and cooldown spell mods with charges ignored (unknown existing cases)
((Player*)this)->SendCooldownEvent(createBySpell); ((Player*)this)->SendCooldownEvent(createBySpell);
} }
} }
@ -8677,7 +8677,7 @@ bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, f
{ {
if(unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END) if(unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END)
{ {
sLog.outError("ERROR in HandleStatModifier(): non existed UnitMods or wrong UnitModifierType!"); sLog.outError("ERROR in HandleStatModifier(): nonexistent UnitMods or wrong UnitModifierType!");
return false; return false;
} }
@ -8749,7 +8749,7 @@ float Unit::GetModifierValue(UnitMods unitMod, UnitModifierType modifierType) co
{ {
if( unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END) if( unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END)
{ {
sLog.outError("trial to access non existed modifier value from UnitMods!"); sLog.outError("attempt to access nonexistent modifier value from UnitMods!");
return 0.0f; return 0.0f;
} }
@ -8779,7 +8779,7 @@ float Unit::GetTotalAuraModValue(UnitMods unitMod) const
{ {
if(unitMod >= UNIT_MOD_END) if(unitMod >= UNIT_MOD_END)
{ {
sLog.outError("trial to access non existed UnitMods in GetTotalAuraModValue()!"); sLog.outError("attempt to access nonexistent UnitMods in GetTotalAuraModValue()!");
return 0.0f; return 0.0f;
} }
@ -9208,7 +9208,7 @@ void CharmInfo::InitCharmCreateSpells()
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId); SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
if(!spellInfo) onlyselfcast = false; if(!spellInfo) onlyselfcast = false;
for(uint32 i = 0;i<3 && onlyselfcast;++i) //non existent spell will not make any problems as onlyselfcast would be false -> break right away for(uint32 i = 0;i<3 && onlyselfcast;++i) //nonexistent spell will not make any problems as onlyselfcast would be false -> break right away
{ {
if(spellInfo->EffectImplicitTargetA[i] != TARGET_SELF && spellInfo->EffectImplicitTargetA[i] != 0) if(spellInfo->EffectImplicitTargetA[i] != TARGET_SELF && spellInfo->EffectImplicitTargetA[i] != 0)
onlyselfcast = false; onlyselfcast = false;

6
src/game/Unit.h
View file

@ -349,20 +349,20 @@ enum AuraRemoveMode
enum UnitMods enum UnitMods
{ {
UNIT_MOD_STAT_STRENGTH, // UNIT_MOD_STAT_STRENGTH..UNIT_MOD_STAT_SPIRIT must be in existed order, it's accessed by index values of Stats enum. UNIT_MOD_STAT_STRENGTH, // UNIT_MOD_STAT_STRENGTH..UNIT_MOD_STAT_SPIRIT must be in existing order, it's accessed by index values of Stats enum.
UNIT_MOD_STAT_AGILITY, UNIT_MOD_STAT_AGILITY,
UNIT_MOD_STAT_STAMINA, UNIT_MOD_STAT_STAMINA,
UNIT_MOD_STAT_INTELLECT, UNIT_MOD_STAT_INTELLECT,
UNIT_MOD_STAT_SPIRIT, UNIT_MOD_STAT_SPIRIT,
UNIT_MOD_HEALTH, UNIT_MOD_HEALTH,
UNIT_MOD_MANA, // UNIT_MOD_MANA..UNIT_MOD_RUNIC_POWER must be in existed order, it's accessed by index values of Powers enum. UNIT_MOD_MANA, // UNIT_MOD_MANA..UNIT_MOD_RUNIC_POWER must be in existing order, it's accessed by index values of Powers enum.
UNIT_MOD_RAGE, UNIT_MOD_RAGE,
UNIT_MOD_FOCUS, UNIT_MOD_FOCUS,
UNIT_MOD_ENERGY, UNIT_MOD_ENERGY,
UNIT_MOD_HAPPINESS, UNIT_MOD_HAPPINESS,
UNIT_MOD_RUNE, UNIT_MOD_RUNE,
UNIT_MOD_RUNIC_POWER, UNIT_MOD_RUNIC_POWER,
UNIT_MOD_ARMOR, // UNIT_MOD_ARMOR..UNIT_MOD_RESISTANCE_ARCANE must be in existed order, it's accessed by index values of SpellSchools enum. UNIT_MOD_ARMOR, // UNIT_MOD_ARMOR..UNIT_MOD_RESISTANCE_ARCANE must be in existing order, it's accessed by index values of SpellSchools enum.
UNIT_MOD_RESISTANCE_HOLY, UNIT_MOD_RESISTANCE_HOLY,
UNIT_MOD_RESISTANCE_FIRE, UNIT_MOD_RESISTANCE_FIRE,
UNIT_MOD_RESISTANCE_NATURE, UNIT_MOD_RESISTANCE_NATURE,

8
src/game/UnitAuraProcHandler.cpp
View file

@ -474,7 +474,7 @@ SpellAuraProcResult Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, Aura
if(!triggerEntry) if(!triggerEntry)
{ {
sLog.outError("Unit::HandleHasteAuraProc: Spell %u have not existed triggered spell %u",hasteSpell->Id,triggered_spell_id); sLog.outError("Unit::HandleHasteAuraProc: Spell %u have nonexistent triggered spell %u",hasteSpell->Id,triggered_spell_id);
return SPELL_AURA_PROC_FAILED; return SPELL_AURA_PROC_FAILED;
} }
@ -539,7 +539,7 @@ SpellAuraProcResult Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*
if(!triggerEntry) if(!triggerEntry)
{ {
sLog.outError("Unit::HandleHasteAuraProc: Spell %u have not existed triggered spell %u",triggeredByAuraSpell->Id,triggered_spell_id); sLog.outError("Unit::HandleHasteAuraProc: Spell %u have nonexistent triggered spell %u",triggeredByAuraSpell->Id,triggered_spell_id);
return SPELL_AURA_PROC_FAILED; return SPELL_AURA_PROC_FAILED;
} }
@ -2079,7 +2079,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
SpellEntry const* windfurySpellEntry = sSpellStore.LookupEntry(spellId); SpellEntry const* windfurySpellEntry = sSpellStore.LookupEntry(spellId);
if(!windfurySpellEntry) if(!windfurySpellEntry)
{ {
sLog.outError("Unit::HandleDummyAuraProc: non existed spell id: %u (Windfury)",spellId); sLog.outError("Unit::HandleDummyAuraProc: nonexistent spell id: %u (Windfury)",spellId);
return SPELL_AURA_PROC_FAILED; return SPELL_AURA_PROC_FAILED;
} }
@ -2582,7 +2582,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura
if(!triggerEntry) if(!triggerEntry)
{ {
sLog.outError("Unit::HandleDummyAuraProc: Spell %u have not existed triggered spell %u",dummySpell->Id,triggered_spell_id); sLog.outError("Unit::HandleDummyAuraProc: Spell %u have nonexistent triggered spell %u",dummySpell->Id,triggered_spell_id);
return SPELL_AURA_PROC_FAILED; return SPELL_AURA_PROC_FAILED;
} }

2
src/game/WorldSocket.cpp
View file

@ -665,7 +665,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
if (opcode >= NUM_MSG_TYPES) if (opcode >= NUM_MSG_TYPES)
{ {
sLog.outError( "SESSION: received non-existed opcode 0x%.4X", opcode); sLog.outError( "SESSION: received nonexistent opcode 0x%.4X", opcode);
return -1; return -1;
} }

8
src/mangosd/CliRunnable.cpp
View file

@ -137,7 +137,7 @@ bool ChatHandler::GetDeletedCharacterInfoList(DeletedInfoList& foundList, std::s
info.name = fields[1].GetCppString(); info.name = fields[1].GetCppString();
info.accountId = fields[2].GetUInt32(); info.accountId = fields[2].GetUInt32();
// account name will be empty for not existed account // account name will be empty for nonexistent account
sAccountMgr.GetName (info.accountId, info.accountName); sAccountMgr.GetName (info.accountId, info.accountName);
info.deleteDate = time_t(fields[3].GetUInt64()); info.deleteDate = time_t(fields[3].GetUInt64());
@ -205,11 +205,11 @@ void ChatHandler::HandleCharacterDeletedListHelper(DeletedInfoList const& foundL
if (!m_session) if (!m_session)
PSendSysMessage(LANG_CHARACTER_DELETED_LIST_LINE_CONSOLE, PSendSysMessage(LANG_CHARACTER_DELETED_LIST_LINE_CONSOLE,
itr->lowguid, itr->name.c_str(), itr->accountName.empty() ? "<Not existed>" : itr->accountName.c_str(), itr->lowguid, itr->name.c_str(), itr->accountName.empty() ? "<nonexistent>" : itr->accountName.c_str(),
itr->accountId, dateStr.c_str()); itr->accountId, dateStr.c_str());
else else
PSendSysMessage(LANG_CHARACTER_DELETED_LIST_LINE_CHAT, PSendSysMessage(LANG_CHARACTER_DELETED_LIST_LINE_CHAT,
itr->lowguid, itr->name.c_str(), itr->accountName.empty() ? "<Not existed>" : itr->accountName.c_str(), itr->lowguid, itr->name.c_str(), itr->accountName.empty() ? "<nonexistent>" : itr->accountName.c_str(),
itr->accountId, dateStr.c_str()); itr->accountId, dateStr.c_str());
} }
@ -320,7 +320,7 @@ bool ChatHandler::HandleCharacterDeletedRestoreCommand(const char* args)
if (newCharName.empty()) if (newCharName.empty())
{ {
// Drop not existed account cases // Drop nonexistent account cases
for (DeletedInfoList::iterator itr = foundList.begin(); itr != foundList.end(); ++itr) for (DeletedInfoList::iterator itr = foundList.begin(); itr != foundList.end(); ++itr)
HandleCharacterDeletedRestoreHelper(*itr); HandleCharacterDeletedRestoreHelper(*itr);
} }

4
src/shared/Database/Database.h
View file

@ -121,9 +121,9 @@ class MANGOS_DLL_SPEC Database
virtual unsigned long escape_string(char *to, const char *from, unsigned long length) { strncpy(to,from,length); return length; } virtual unsigned long escape_string(char *to, const char *from, unsigned long length) { strncpy(to,from,length); return length; }
void escape_string(std::string& str); void escape_string(std::string& str);
// must be called before first query in thread (one time for thread using one from existed Database objects) // must be called before first query in thread (one time for thread using one from existing Database objects)
virtual void ThreadStart(); virtual void ThreadStart();
// must be called before finish thread run (one time for thread using one from existed Database objects) // must be called before finish thread run (one time for thread using one from existing Database objects)
virtual void ThreadEnd(); virtual void ThreadEnd();
// sets the result queue of the current thread, be careful what thread you call this from // sets the result queue of the current thread, be careful what thread you call this from

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 "10292" #define REVISION_NR "10293"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__