Skip to content

Commit

Permalink
Fix error due to new chat type
Browse files Browse the repository at this point in the history
  • Loading branch information
killerwife committed Oct 18, 2017
1 parent 7a57ab5 commit 959db86
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/game/Entities/Creature.h
Expand Up @@ -326,6 +326,7 @@ enum ChatType
CHAT_TYPE_BOSS_WHISPER = 5,
CHAT_TYPE_ZONE_YELL = 6,
CHAT_TYPE_ZONE_EMOTE = 7,
CHAT_TYPE_MAX
};

// Selection method used by SelectAttackingTarget
Expand Down
2 changes: 1 addition & 1 deletion src/game/Globals/ObjectMgr.cpp
Expand Up @@ -7788,7 +7788,7 @@ bool ObjectMgr::LoadMangosStrings(DatabaseType& db, char const* table, int32 min
data.LanguageId = LANG_UNIVERSAL;
}

if (data.Type > CHAT_TYPE_ZONE_YELL)
if (data.Type >= CHAT_TYPE_MAX)
{
_DoStringError(entry, "Entry %i in table `%s` has Type %u but this Chat Type does not exist.", entry, table, data.Type);
data.Type = CHAT_TYPE_SAY;
Expand Down

0 comments on commit 959db86

Please sign in to comment.