aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Achievements/AchievementMgr.cpp2
-rw-r--r--src/server/game/Battlegrounds/BattlegroundMgr.cpp10
-rw-r--r--src/server/game/Battlegrounds/BattlegroundMgr.h2
-rw-r--r--src/server/game/DataStores/DBCStores.cpp2
-rw-r--r--src/server/game/DataStores/DBCStructure.h61
-rw-r--r--src/server/game/DataStores/DBCfmt.h2
-rw-r--r--src/server/game/Entities/Player/Player.cpp18
-rw-r--r--src/server/game/Entities/Player/Player.h2
-rw-r--r--src/server/game/Events/GameEventMgr.cpp4
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp8
-rw-r--r--src/server/game/Groups/Group.cpp2
-rw-r--r--src/server/game/Handlers/CharacterHandler.cpp20
-rw-r--r--src/server/scripts/Commands/cs_character.cpp8
-rw-r--r--src/server/scripts/Commands/cs_lookup.cpp8
-rw-r--r--src/server/scripts/Commands/cs_titles.cpp10
15 files changed, 81 insertions, 78 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index a749396ad79..47424798ec0 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -370,7 +370,7 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Un
case ACHIEVEMENT_CRITERIA_DATA_TYPE_S_KNOWN_TITLE:
{
if (CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(known_title.title_id))
- return source && source->HasTitle(titleInfo->bit_index);
+ return source && source->HasTitle(titleInfo->MaskID);
return false;
}
diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp
index eae6a831290..663530cd8ff 100644
--- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp
+++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp
@@ -742,8 +742,8 @@ bool BattlegroundMgr::CreateBattleground(BattlegroundTemplate const* bgTemplate)
AddBattleground(bg);
}
- bg->SetMapId(bgTemplate->BattlemasterEntry->mapid[0]);
- bg->SetName(bgTemplate->BattlemasterEntry->name);
+ bg->SetMapId(bgTemplate->BattlemasterEntry->MapID[0]);
+ bg->SetName(bgTemplate->BattlemasterEntry->Name_lang);
bg->SetInstanceID(0);
bg->SetArenaorBGType(bgTemplate->IsArena());
bg->SetMinPlayersPerTeam(bgTemplate->MinPlayersPerTeam);
@@ -852,8 +852,8 @@ void BattlegroundMgr::LoadBattlegroundTemplates()
_battlegroundTemplates[bgTypeId] = bgTemplate;
- if (bgTemplate.BattlemasterEntry->mapid[1] == -1) // in this case we have only one mapId
- _battlegroundMapTemplates[bgTemplate.BattlemasterEntry->mapid[0]] = &_battlegroundTemplates[bgTypeId];
+ if (bgTemplate.BattlemasterEntry->MapID[1] == -1) // in this case we have only one mapId
+ _battlegroundMapTemplates[bgTemplate.BattlemasterEntry->MapID[0]] = &_battlegroundTemplates[bgTypeId];
++count;
}
@@ -1211,7 +1211,7 @@ BattlegroundTypeId BattlegroundMgr::GetRandomBG(BattlegroundTypeId bgTypeId)
uint32 weight = 0;
BattlegroundSelectionWeightMap selectionWeights;
- for (int32 mapId : bgTemplate->BattlemasterEntry->mapid)
+ for (int32 mapId : bgTemplate->BattlemasterEntry->MapID)
{
if (mapId == -1)
break;
diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h
index 23689c03fba..0be6092eb4b 100644
--- a/src/server/game/Battlegrounds/BattlegroundMgr.h
+++ b/src/server/game/Battlegrounds/BattlegroundMgr.h
@@ -51,7 +51,7 @@ struct BattlegroundTemplate
uint32 ScriptId;
BattlemasterListEntry const* BattlemasterEntry;
- bool IsArena() const { return BattlemasterEntry->type == MAP_ARENA; }
+ bool IsArena() const { return BattlemasterEntry->InstanceType == MAP_ARENA; }
};
class BattlegroundMgr
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index 6bf5b49b297..af24e182869 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -356,7 +356,7 @@ void LoadDBCStores(const std::string& dataPath)
LoadDBC(availableDbcLocales, bad_dbc_files, sCharStartOutfitStore, dbcPath, "CharStartOutfit.dbc");//15595
for (uint32 i = 0; i < sCharStartOutfitStore.GetNumRows(); ++i)
if (CharStartOutfitEntry const* outfit = sCharStartOutfitStore.LookupEntry(i))
- sCharStartOutfitMap[outfit->Race | (outfit->Class << 8) | (outfit->Gender << 16)] = outfit;
+ sCharStartOutfitMap[outfit->RaceID | (outfit->ClassID << 8) | (outfit->GenderID << 16)] = outfit;
LoadDBC(availableDbcLocales, bad_dbc_files, sCharTitlesStore, dbcPath, "CharTitles.dbc");//15595
LoadDBC(availableDbcLocales, bad_dbc_files, sChatChannelsStore, dbcPath, "ChatChannels.dbc");//15595
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index df25d288ad8..18096038b79 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -653,45 +653,48 @@ struct BarberShopStyleEntry
struct BattlemasterListEntry
{
- uint32 id; // 0
- int32 mapid[8]; // 1-8 mapid
- uint32 type; // 9 map type (3 - BG, 4 - arena)
- //uint32 canJoinAsGroup; // 10 (0 or 1)
- char* name; // 11
- uint32 maxGroupSize; // 12 maxGroupSize, used for checking if queue as group
- uint32 HolidayWorldStateId; // 13 new 3.1
- uint32 minLevel; // 14, min level (sync with PvPDifficulty.dbc content)
- uint32 maxLevel; // 15, max level (sync with PvPDifficulty.dbc content)
- //uint32 maxGroupSizeRated; // 16 4.0.1
- //uint32 unk; // 17 - 4.0.6.13596
- //uint32 maxPlayers; // 18 4.0.1
- //uint32 unk1; // 19 4.0.3, value 2 for Rated Battlegrounds
+ uint32 ID; // 0
+ uint32 MapID[16]; // 1-16 mapid
+ uint32 InstanceType; // 17 map type (3 - BG, 4 - arena)
+ //uint32 GroupsAllowed; // 18 (0 or 1)
+ char* Name_lang; // 19
+ uint32 MaxGroupSize; // 20 maxGroupSize, used for checking if queue as group
+ uint32 HolidayWorldState; // 21 new 3.1
+ uint32 MinLevel; // 22, min level (sync with PvPDifficulty.dbc content)
+ uint32 MaxLevel; // 23, max level (sync with PvPDifficulty.dbc content)
+ //uint32 RatedPlayers; // 24 4.0.1
+ //uint32 MinPlayers; // 25 - 4.0.6.13596
+ //uint32 MaxPlayers; // 26 4.0.1
+ //uint32 Flags; // 27 4.0.3, value 2 for Rated Battlegrounds
+ //uint32 IconFileDataID; // 28
+ //char* GameType_lang; // 29
+ //uint32 Unk1; // 30
};
#define MAX_OUTFIT_ITEMS 24
struct CharStartOutfitEntry
{
- //uint32 Id; // 0
- uint8 Race; // 1
- uint8 Class; // 2
- uint8 Gender; // 3
- //uint8 Unused; // 4
- int32 ItemId[MAX_OUTFIT_ITEMS]; // 5-28
- //int32 ItemDisplayId[MAX_OUTFIT_ITEMS]; // 29-52 not required at server side
- //int32 ItemInventorySlot[MAX_OUTFIT_ITEMS]; // 53-76 not required at server side
- uint32 PetDisplayId; // 77 Pet Model ID for starting pet
- uint32 PetFamilyEntry; // 78 Pet Family Entry for starting pet
+ //uint32 ID; // 0
+ uint8 RaceID; // 1
+ uint8 ClassID; // 2
+ uint8 GenderID; // 3
+ //uint8 OutfitID; // 4
+ int32 ItemID[MAX_OUTFIT_ITEMS]; // 5-28
+ //int32 ItemDisplayID[MAX_OUTFIT_ITEMS]; // 29-52 not required at server side
+ //int32 InventoryType[MAX_OUTFIT_ITEMS]; // 53-76 not required at server side
+ uint32 PetDisplayID; // 77 Pet Model ID for starting pet
+ uint32 PetFamilyID; // 78 Pet Family Entry for starting pet
};
struct CharTitlesEntry
{
- uint32 ID; // 0, title ids, for example in Quest::GetCharTitleId()
- //uint32 unk1; // 1 flags?
- char* nameMale; // 2 m_name_lang
- char* nameFemale; // 3 m_name1_lang
- uint32 bit_index; // 4 m_mask_ID used in PLAYER_CHOSEN_TITLE and 1<<index in PLAYER__FIELD_KNOWN_TITLES
- //uint32 // 5
+ uint32 ID; // 0, title ids, for example in Quest::GetCharTitleId()
+ //uint32 ConditionID; // 1
+ char* NameMale_lang; // 2 m_name_lang
+ char* NameFemale_lang; // 3 m_name1_lang
+ uint32 MaskID; // 4 m_mask_ID used in PLAYER_CHOSEN_TITLE and 1<<index in PLAYER__FIELD_KNOWN_TITLES
+ //uint32 Flags; // 5
};
struct ChatChannelsEntry
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index c1399db57bd..92de682017c 100644
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -34,7 +34,7 @@ char const AuctionHouseEntryfmt[] = "niiix";
char const BankBagSlotPricesEntryfmt[] = "ni";
char const BannedAddOnsfmt[] = "nxxxxxxxxxx";
char const BarberShopStyleEntryfmt[] = "nixxxiii";
-char const BattlemasterListEntryfmt[] = "niiiiiiiiixsiiiixxxx";
+char const BattlemasterListEntryfmt[] = "niiiiiiiiiiiiiiiiixsiiiixxxxxxx";
char const CharStartOutfitEntryfmt[] = "dbbbXiiiiiiiiiiiiiiiiiiiiiiiixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxii";
char const CharTitlesEntryfmt[] = "nxssix";
char const ChatChannelsEntryfmt[] = "nixsx";
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 50151028b24..985d03bd539 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1126,10 +1126,10 @@ bool Player::Create(ObjectGuid::LowType guidlow, WorldPackets::Character::Charac
{
for (int j = 0; j < MAX_OUTFIT_ITEMS; ++j)
{
- if (oEntry->ItemId[j] <= 0)
+ if (oEntry->ItemID[j] <= 0)
continue;
- uint32 itemId = oEntry->ItemId[j];
+ uint32 itemId = oEntry->ItemID[j];
// just skip, reported in ObjectMgr::LoadItemTemplates
ItemTemplate const* iProto = sObjectMgr->GetItemTemplate(itemId);
@@ -9705,12 +9705,12 @@ void Player::SendBGWeekendWorldStates()
for (uint32 i = 1; i < sBattlemasterListStore.GetNumRows(); ++i)
{
BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(i);
- if (bl && bl->HolidayWorldStateId)
+ if (bl && bl->HolidayWorldState)
{
- if (BattlegroundMgr::IsBGWeekend((BattlegroundTypeId)bl->id))
- SendUpdateWorldState(bl->HolidayWorldStateId, 1);
+ if (BattlegroundMgr::IsBGWeekend((BattlegroundTypeId)bl->ID))
+ SendUpdateWorldState(bl->HolidayWorldState, 1);
else
- SendUpdateWorldState(bl->HolidayWorldStateId, 0);
+ SendUpdateWorldState(bl->HolidayWorldState, 0);
}
}
}
@@ -24957,8 +24957,8 @@ bool Player::HasTitle(uint32 bitIndex) const
void Player::SetTitle(CharTitlesEntry const* title, bool lost)
{
- uint32 fieldIndexOffset = title->bit_index / 32;
- uint32 flag = 1 << (title->bit_index % 32);
+ uint32 fieldIndexOffset = title->MaskID / 32;
+ uint32 flag = 1 << (title->MaskID % 32);
if (lost)
{
@@ -24976,7 +24976,7 @@ void Player::SetTitle(CharTitlesEntry const* title, bool lost)
}
WorldPacket data(SMSG_TITLE_EARNED, 4 + 4);
- data << uint32(title->bit_index);
+ data << uint32(title->MaskID);
data << uint32(lost ? 0 : 1); // 1 - earned, 0 - lost
GetSession()->SendPacket(&data);
}
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 8509ec2bcf1..fe8ef48d267 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2539,7 +2539,7 @@ class Player : public Unit, public GridObject<Player>
void CompletedAchievement(AchievementEntry const* entry);
bool HasTitle(uint32 bitIndex) const;
- bool HasTitle(CharTitlesEntry const* title) const { return HasTitle(title->bit_index); }
+ bool HasTitle(CharTitlesEntry const* title) const { return HasTitle(title->MaskID); }
void SetTitle(CharTitlesEntry const* title, bool lost = false);
//bool isActiveObject() const { return true; }
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 780360dc945..f8bc5e01c7b 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -1484,10 +1484,10 @@ void GameEventMgr::UpdateWorldStates(uint16 event_id, bool Activate)
if (bgTypeId != BATTLEGROUND_TYPE_NONE)
{
BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(bgTypeId);
- if (bl && bl->HolidayWorldStateId)
+ if (bl && bl->HolidayWorldState)
{
WorldPacket data;
- sBattlegroundMgr->BuildUpdateWorldStatePacket(&data, bl->HolidayWorldStateId, Activate ? 1 : 0);
+ sBattlegroundMgr->BuildUpdateWorldStatePacket(&data, bl->HolidayWorldState, Activate ? 1 : 0);
sWorld->SendGlobalMessage(&data);
}
}
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index a582f2b2afa..8ec41b82d7f 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2792,10 +2792,10 @@ void ObjectMgr::LoadItemTemplates()
for (int j = 0; j < MAX_OUTFIT_ITEMS; ++j)
{
- if (entry->ItemId[j] <= 0)
+ if (entry->ItemID[j] <= 0)
continue;
- uint32 item_id = entry->ItemId[j];
+ uint32 item_id = entry->ItemID[j];
if (!GetItemTemplate(item_id))
notFoundOutfit.insert(item_id);
@@ -3098,10 +3098,10 @@ void ObjectMgr::PlayerCreateInfoAddItemHelper(uint32 race_, uint32 class_, uint3
bool found = false;
for (uint8 x = 0; x < MAX_OUTFIT_ITEMS; ++x)
{
- if (entry->ItemId[x] > 0 && uint32(entry->ItemId[x]) == itemId)
+ if (entry->ItemID[x] > 0 && uint32(entry->ItemID[x]) == itemId)
{
found = true;
- const_cast<CharStartOutfitEntry*>(entry)->ItemId[x] = 0;
+ const_cast<CharStartOutfitEntry*>(entry)->ItemID[x] = 0;
break;
}
}
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index a434df716f0..8795bd812de 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -1851,7 +1851,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const*
// check for min / max count
uint32 memberscount = GetMembersCount();
- if (memberscount > bgEntry->maxGroupSize) // no MinPlayerCount for battlegrounds
+ if (memberscount > bgEntry->MaxGroupSize) // no MinPlayerCount for battlegrounds
return ERR_BATTLEGROUND_NONE; // ERR_GROUP_JOIN_BATTLEGROUND_TOO_MANY handled on client side
// get a player as reference, to compare other players' stats to (arena team id, queue id based on level, etc.)
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index 40f7eb98029..afbc283676d 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -2113,28 +2113,28 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recvData)
// new team
if (team == TEAM_ALLIANCE)
{
- uint32 bitIndex = htitleInfo->bit_index;
- uint32 index = bitIndex / 32;
- uint32 old_flag = 1 << (bitIndex % 32);
- uint32 new_flag = 1 << (atitleInfo->bit_index % 32);
+ uint32 maskID = htitleInfo->MaskID;
+ uint32 index = maskID / 32;
+ uint32 old_flag = 1 << (maskID % 32);
+ uint32 new_flag = 1 << (atitleInfo->MaskID % 32);
if (knownTitles[index] & old_flag)
{
knownTitles[index] &= ~old_flag;
// use index of the new title
- knownTitles[atitleInfo->bit_index / 32] |= new_flag;
+ knownTitles[atitleInfo->MaskID / 32] |= new_flag;
}
}
else
{
- uint32 bitIndex = atitleInfo->bit_index;
- uint32 index = bitIndex / 32;
- uint32 old_flag = 1 << (bitIndex % 32);
- uint32 new_flag = 1 << (htitleInfo->bit_index % 32);
+ uint32 maskID = atitleInfo->MaskID;
+ uint32 index = maskID / 32;
+ uint32 old_flag = 1 << (maskID % 32);
+ uint32 new_flag = 1 << (htitleInfo->MaskID % 32);
if (knownTitles[index] & old_flag)
{
knownTitles[index] &= ~old_flag;
// use index of the new title
- knownTitles[htitleInfo->bit_index / 32] |= new_flag;
+ knownTitles[htitleInfo->MaskID / 32] |= new_flag;
}
}
diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp
index 0b351e310f4..058f7435713 100644
--- a/src/server/scripts/Commands/cs_character.cpp
+++ b/src/server/scripts/Commands/cs_character.cpp
@@ -277,11 +277,11 @@ public:
if (titleInfo && target->HasTitle(titleInfo))
{
- std::string name = target->getGender() == GENDER_MALE ? titleInfo->nameMale : titleInfo->nameFemale;
+ std::string name = target->getGender() == GENDER_MALE ? titleInfo->NameMale_lang : titleInfo->NameFemale_lang;
if (name.empty())
continue;
- char const* activeStr = target->GetUInt32Value(PLAYER_CHOSEN_TITLE) == titleInfo->bit_index
+ char const* activeStr = target->GetUInt32Value(PLAYER_CHOSEN_TITLE) == titleInfo->MaskID
? handler->GetTrinityString(LANG_ACTIVE)
: "";
@@ -290,9 +290,9 @@ public:
// send title in "id (idx:idx) - [namedlink locale]" format
if (handler->GetSession())
- handler->PSendSysMessage(LANG_TITLE_LIST_CHAT, id, titleInfo->bit_index, id, titleNameStr, localeNames[loc], knownStr, activeStr);
+ handler->PSendSysMessage(LANG_TITLE_LIST_CHAT, id, titleInfo->MaskID, id, titleNameStr, localeNames[loc], knownStr, activeStr);
else
- handler->PSendSysMessage(LANG_TITLE_LIST_CONSOLE, id, titleInfo->bit_index, name.c_str(), localeNames[loc], knownStr, activeStr);
+ handler->PSendSysMessage(LANG_TITLE_LIST_CONSOLE, id, titleInfo->MaskID, name.c_str(), localeNames[loc], knownStr, activeStr);
}
}
diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp
index b4b0c2502ad..1833761ea17 100644
--- a/src/server/scripts/Commands/cs_lookup.cpp
+++ b/src/server/scripts/Commands/cs_lookup.cpp
@@ -1072,7 +1072,7 @@ public:
CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(id);
if (titleInfo)
{
- std::string name = target->getGender() == GENDER_MALE ? titleInfo->nameMale : titleInfo->nameFemale;
+ std::string name = target->getGender() == GENDER_MALE ? titleInfo->NameMale_lang : titleInfo->NameFemale_lang;
if (name.empty())
continue;
@@ -1088,7 +1088,7 @@ public:
char const* knownStr = target && target->HasTitle(titleInfo) ? handler->GetTrinityString(LANG_KNOWN) : "";
- char const* activeStr = target && target->GetUInt32Value(PLAYER_CHOSEN_TITLE) == titleInfo->bit_index
+ char const* activeStr = target && target->GetUInt32Value(PLAYER_CHOSEN_TITLE) == titleInfo->MaskID
? handler->GetTrinityString(LANG_ACTIVE)
: "";
@@ -1097,9 +1097,9 @@ public:
// send title in "id (idx:idx) - [namedlink locale]" format
if (handler->GetSession())
- handler->PSendSysMessage(LANG_TITLE_LIST_CHAT, id, titleInfo->bit_index, id, titleNameStr, "", knownStr, activeStr);
+ handler->PSendSysMessage(LANG_TITLE_LIST_CHAT, id, titleInfo->MaskID, id, titleNameStr, "", knownStr, activeStr);
else
- handler->PSendSysMessage(LANG_TITLE_LIST_CONSOLE, id, titleInfo->bit_index, titleNameStr, "", knownStr, activeStr);
+ handler->PSendSysMessage(LANG_TITLE_LIST_CONSOLE, id, titleInfo->MaskID, titleNameStr, "", knownStr, activeStr);
++counter;
}
diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp
index 0826e0ca476..60d376d867a 100644
--- a/src/server/scripts/Commands/cs_titles.cpp
+++ b/src/server/scripts/Commands/cs_titles.cpp
@@ -94,9 +94,9 @@ public:
std::string tNameLink = handler->GetNameLink(target);
target->SetTitle(titleInfo); // to be sure that title now known
- target->SetUInt32Value(PLAYER_CHOSEN_TITLE, titleInfo->bit_index);
+ target->SetUInt32Value(PLAYER_CHOSEN_TITLE, titleInfo->MaskID);
- handler->PSendSysMessage(LANG_TITLE_CURRENT_RES, id, target->getGender() == GENDER_MALE ? titleInfo->nameMale : titleInfo->nameFemale, tNameLink.c_str());
+ handler->PSendSysMessage(LANG_TITLE_CURRENT_RES, id, target->getGender() == GENDER_MALE ? titleInfo->NameMale_lang : titleInfo->NameFemale_lang, tNameLink.c_str());
return true;
}
@@ -138,7 +138,7 @@ public:
std::string tNameLink = handler->GetNameLink(target);
char titleNameStr[80];
- snprintf(titleNameStr, 80, target->getGender() == GENDER_MALE ? titleInfo->nameMale : titleInfo->nameFemale, target->GetName().c_str());
+ snprintf(titleNameStr, 80, target->getGender() == GENDER_MALE ? titleInfo->NameMale_lang : titleInfo->NameFemale_lang, target->GetName().c_str());
target->SetTitle(titleInfo);
handler->PSendSysMessage(LANG_TITLE_ADD_RES, id, titleNameStr, tNameLink.c_str());
@@ -186,7 +186,7 @@ public:
std::string tNameLink = handler->GetNameLink(target);
char titleNameStr[80];
- snprintf(titleNameStr, 80, target->getGender() == GENDER_MALE ? titleInfo->nameMale : titleInfo->nameFemale, target->GetName().c_str());
+ snprintf(titleNameStr, 80, target->getGender() == GENDER_MALE ? titleInfo->NameMale_lang : titleInfo->NameFemale_lang, target->GetName().c_str());
handler->PSendSysMessage(LANG_TITLE_REMOVE_RES, id, titleNameStr, tNameLink.c_str());
@@ -225,7 +225,7 @@ public:
for (uint32 i = 1; i < sCharTitlesStore.GetNumRows(); ++i)
if (CharTitlesEntry const* tEntry = sCharTitlesStore.LookupEntry(i))
- titles2 &= ~(uint64(1) << tEntry->bit_index);
+ titles2 &= ~(uint64(1) << tEntry->MaskID);
titles &= ~titles2; // remove not existed titles