More cleanup after last commit spree
This commit is contained in:
@@ -2846,7 +2846,7 @@ DROP TABLE IF EXISTS `instance_template`;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `instance_template` (
|
||||
`map` smallint(5) unsigned NOT NULL,
|
||||
`parent` int(10) unsigned NOT NULL,
|
||||
`parent` smallint(5) unsigned NOT NULL,
|
||||
`script` varchar(128) NOT NULL DEFAULT '',
|
||||
`allowMount` tinyint(1) NOT NULL DEFAULT '0',
|
||||
PRIMARY KEY (`map`)
|
||||
|
||||
@@ -127,7 +127,7 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction, SQLTransaction&
|
||||
uint32 owner_accid = sObjectMgr->GetPlayerAccountIdByGUID(auction->owner);
|
||||
|
||||
sLog->outCommand(bidder_accId,"GM %s (Account: %u) won item in auction: %s (Entry: %u Count: %u) and pay money: %u. Original owner %s (Account: %u)",
|
||||
bidder_name.c_str(),bidder_accId,pItem->GetTemplate()->Name1,pItem->GetEntry(),pItem->GetCount(),auction->bid,owner_name.c_str(),owner_accid);
|
||||
bidder_name.c_str(),bidder_accId,pItem->GetTemplate()->Name1.c_str(),pItem->GetEntry(),pItem->GetCount(),auction->bid,owner_name.c_str(),owner_accid);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -543,18 +543,18 @@ void BattlegroundSA::EventPlayerDamagedGO(Player* /*plr*/, GameObject* go, uint3
|
||||
if (go->GetGOInfo()->building.destroyedEvent == 19837)
|
||||
SendWarningToAll(LANG_BG_SA_CHAMBER_BREACHED);
|
||||
else
|
||||
SendWarningToAll(LANG_BG_SA_WAS_DESTROYED, go->GetGOInfo()->name);
|
||||
SendWarningToAll(LANG_BG_SA_WAS_DESTROYED, go->GetGOInfo()->name.c_str());
|
||||
}
|
||||
|
||||
if (eventType == go->GetGOInfo()->building.damageEvent)
|
||||
SendWarningToAll(LANG_BG_SA_IS_UNDER_ATTACK, go->GetGOInfo()->name);
|
||||
SendWarningToAll(LANG_BG_SA_IS_UNDER_ATTACK, go->GetGOInfo()->name.c_str());
|
||||
}
|
||||
|
||||
void BattlegroundSA::HandleKillUnit(Creature* unit, Player* killer)
|
||||
{
|
||||
if (!unit)
|
||||
return;
|
||||
|
||||
|
||||
if (unit->GetEntry() == NPC_DEMOLISHER_SA)
|
||||
UpdatePlayerScore(killer, SCORE_DESTROYED_DEMOLISHER, 1);
|
||||
}
|
||||
|
||||
@@ -656,9 +656,9 @@ bool ChatHandler::HandleListObjectCommand(const char *args)
|
||||
uint32 entry = fields[5].GetUInt32();
|
||||
|
||||
if (m_session)
|
||||
PSendSysMessage(LANG_GO_LIST_CHAT, guid, entry, guid, gInfo->name, x, y, z, mapid);
|
||||
PSendSysMessage(LANG_GO_LIST_CHAT, guid, entry, guid, gInfo->name.c_str(), x, y, z, mapid);
|
||||
else
|
||||
PSendSysMessage(LANG_GO_LIST_CONSOLE, guid, gInfo->name, x, y, z, mapid);
|
||||
PSendSysMessage(LANG_GO_LIST_CONSOLE, guid, gInfo->name.c_str(), x, y, z, mapid);
|
||||
} while (result->NextRow());
|
||||
}
|
||||
|
||||
|
||||
@@ -43,10 +43,10 @@ struct GameObjectTemplate
|
||||
uint32 entry;
|
||||
uint32 type;
|
||||
uint32 displayId;
|
||||
const char* name;
|
||||
const char* IconName;
|
||||
const char* castBarCaption;
|
||||
const char* unk1;
|
||||
std::string name;
|
||||
std::string IconName;
|
||||
std::string castBarCaption;
|
||||
std::string unk1;
|
||||
uint32 faction;
|
||||
uint32 flags;
|
||||
float size;
|
||||
@@ -403,7 +403,7 @@ struct GameObjectTemplate
|
||||
};
|
||||
|
||||
|
||||
char const* AIName;
|
||||
std::string AIName;
|
||||
uint32 ScriptId;
|
||||
|
||||
// helpers
|
||||
|
||||
@@ -582,7 +582,7 @@ struct ItemTemplate
|
||||
uint32 Class; // id from ItemClass.dbc
|
||||
uint32 SubClass; // id from ItemSubClass.dbc
|
||||
int32 Unk0;
|
||||
const char* Name1;
|
||||
std::string Name1;
|
||||
uint32 DisplayInfoID; // id from ItemDisplayInfo.dbc
|
||||
uint32 Quality;
|
||||
uint32 Flags;
|
||||
@@ -622,7 +622,7 @@ struct ItemTemplate
|
||||
float RangedModRange;
|
||||
_Spell Spells[MAX_ITEM_PROTO_SPELLS];
|
||||
uint32 Bonding;
|
||||
const char* Description;
|
||||
std::string Description;
|
||||
uint32 PageText;
|
||||
uint32 LanguageID;
|
||||
uint32 PageMaterial;
|
||||
|
||||
@@ -2726,7 +2726,7 @@ GameObject* Player::GetGameObjectIfCanInteractWith(uint64 guid, GameobjectTypes
|
||||
if (go->IsWithinDistInMap(this, maxdist))
|
||||
return go;
|
||||
|
||||
sLog->outDebug(LOG_FILTER_MAPS, "IsGameObjectOfTypeInRange: GameObject '%s' [GUID: %u] is too far away from player %s [GUID: %u] to be used by him (distance=%f, maximal 10 is allowed)", go->GetGOInfo()->name,
|
||||
sLog->outDebug(LOG_FILTER_MAPS, "IsGameObjectOfTypeInRange: GameObject '%s' [GUID: %u] is too far away from player %s [GUID: %u] to be used by him (distance=%f, maximal 10 is allowed)", go->GetGOInfo()->name.c_str(),
|
||||
go->GetGUIDLow(), GetName(), GetGUIDLow(), go->GetDistance(this));
|
||||
}
|
||||
}
|
||||
@@ -18022,7 +18022,7 @@ bool Player::Satisfy(AccessRequirement const* ar, uint32 target_map, bool report
|
||||
else if (mapDiff->hasErrorMessage) // if (missingAchievement) covered by this case
|
||||
SendTransferAborted(target_map, TRANSFER_ABORT_DIFFICULTY, target_difficulty);
|
||||
else if (missingItem)
|
||||
GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, sObjectMgr->GetItemTemplate(missingItem)->Name1);
|
||||
GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED_AND_ITEM), LevelMin, sObjectMgr->GetItemTemplate(missingItem)->Name1.c_str());
|
||||
else if (LevelMin)
|
||||
GetSession()->SendAreaTriggerMessage(GetSession()->GetTrinityString(LANG_LEVEL_MINREQUIRED), LevelMin);
|
||||
}
|
||||
|
||||
@@ -569,7 +569,7 @@ void ObjectMgr::LoadCreatureTemplates()
|
||||
uint32 entry = fields[0].GetUInt32();
|
||||
|
||||
|
||||
CreatureTemplate creatureTemplate;
|
||||
CreatureTemplate& creatureTemplate = CreatureTemplateStore[entry];
|
||||
|
||||
creatureTemplate.Entry = entry;
|
||||
|
||||
@@ -659,9 +659,6 @@ void ObjectMgr::LoadCreatureTemplates()
|
||||
creatureTemplate.flags_extra = fields[82].GetUInt32();
|
||||
creatureTemplate.ScriptID = GetScriptId(fields[83].GetCString());
|
||||
|
||||
// Add to map
|
||||
CreatureTemplateStore[entry] = creatureTemplate;
|
||||
|
||||
++count;
|
||||
}
|
||||
while (result->NextRow());
|
||||
@@ -703,7 +700,7 @@ void ObjectMgr::LoadCreatureTemplateAddons()
|
||||
continue;
|
||||
}
|
||||
|
||||
CreatureAddon creatureAddon;
|
||||
CreatureAddon& creatureAddon = CreatureTemplateAddonStore[entry];
|
||||
|
||||
creatureAddon.path_id = fields[1].GetUInt32();
|
||||
creatureAddon.mount = fields[2].GetUInt32();
|
||||
@@ -737,8 +734,6 @@ void ObjectMgr::LoadCreatureTemplateAddons()
|
||||
if (!sEmotesStore.LookupEntry(creatureAddon.emote))
|
||||
sLog->outErrorDb("Creature (GUID: %u) has invalid emote (%u) defined in `creature_addon`.", entry, creatureAddon.emote);
|
||||
|
||||
CreatureTemplateAddonStore[entry] = creatureAddon;
|
||||
|
||||
++count;
|
||||
}
|
||||
while (result->NextRow());
|
||||
@@ -1073,7 +1068,7 @@ void ObjectMgr::LoadCreatureAddons()
|
||||
continue;
|
||||
}
|
||||
|
||||
CreatureAddon creatureAddon;
|
||||
CreatureAddon& creatureAddon = CreatureAddonStore[guid];
|
||||
|
||||
creatureAddon.path_id = fields[1].GetUInt32();
|
||||
creatureAddon.mount = fields[2].GetUInt32();
|
||||
@@ -1107,8 +1102,6 @@ void ObjectMgr::LoadCreatureAddons()
|
||||
if (!sEmotesStore.LookupEntry(creatureAddon.emote))
|
||||
sLog->outErrorDb("Creature (GUID: %u) has invalid emote (%u) defined in `creature_addon`.", guid, creatureAddon.emote);
|
||||
|
||||
CreatureAddonStore[guid] = creatureAddon;
|
||||
|
||||
++count;
|
||||
}
|
||||
while (result->NextRow());
|
||||
@@ -1164,7 +1157,7 @@ void ObjectMgr::LoadEquipmentTemplates()
|
||||
|
||||
uint16 entry = fields[0].GetUInt16();
|
||||
|
||||
EquipmentInfo equipmentInfo;
|
||||
EquipmentInfo& equipmentInfo = EquipmentInfoStore[entry];
|
||||
|
||||
equipmentInfo.ItemEntry[0] = fields[1].GetUInt32();
|
||||
equipmentInfo.ItemEntry[1] = fields[2].GetUInt32();
|
||||
@@ -1201,8 +1194,6 @@ void ObjectMgr::LoadEquipmentTemplates()
|
||||
}
|
||||
}
|
||||
|
||||
EquipmentInfoStore[entry] = equipmentInfo;
|
||||
|
||||
++count;
|
||||
}
|
||||
while (result->NextRow());
|
||||
@@ -1300,7 +1291,7 @@ void ObjectMgr::LoadCreatureModelInfo()
|
||||
|
||||
uint32 modelId = fields[0].GetUInt32();
|
||||
|
||||
CreatureModelInfo modelInfo;
|
||||
CreatureModelInfo& modelInfo = CreatureModelStore[modelId];
|
||||
|
||||
modelInfo.bounding_radius = fields[1].GetFloat();
|
||||
modelInfo.combat_reach = fields[2].GetFloat();
|
||||
@@ -1329,8 +1320,6 @@ void ObjectMgr::LoadCreatureModelInfo()
|
||||
modelInfo.combat_reach = DEFAULT_COMBAT_REACH;
|
||||
}
|
||||
|
||||
CreatureModelStore[modelId] = modelInfo;
|
||||
|
||||
++count;
|
||||
}
|
||||
while (result->NextRow());
|
||||
@@ -2317,13 +2306,13 @@ void ObjectMgr::LoadItemTemplates()
|
||||
|
||||
uint32 entry = fields[0].GetUInt32();
|
||||
|
||||
ItemTemplate itemTemplate;
|
||||
ItemTemplate& itemTemplate = ItemTemplateStore[entry];
|
||||
|
||||
itemTemplate.ItemId = entry;
|
||||
itemTemplate.Class = uint32(fields[1].GetUInt8());
|
||||
itemTemplate.SubClass = uint32(fields[2].GetUInt8());
|
||||
itemTemplate.Unk0 = fields[3].GetInt32();
|
||||
itemTemplate.Name1 = fields[4].GetCString();
|
||||
itemTemplate.Name1 = fields[4].GetString();
|
||||
itemTemplate.DisplayInfoID = fields[5].GetUInt32();
|
||||
itemTemplate.Quality = uint32(fields[6].GetUInt8());
|
||||
itemTemplate.Flags = uint32(fields[7].GetInt64());
|
||||
@@ -2387,7 +2376,7 @@ void ObjectMgr::LoadItemTemplates()
|
||||
}
|
||||
|
||||
itemTemplate.Bonding = uint32(fields[101].GetUInt8());
|
||||
itemTemplate.Description = fields[102].GetCString();
|
||||
itemTemplate.Description = fields[102].GetString();
|
||||
itemTemplate.PageText = fields[103].GetUInt32();
|
||||
itemTemplate.LanguageID = uint32(fields[104].GetUInt8());
|
||||
itemTemplate.PageMaterial = uint32(fields[105].GetUInt8());
|
||||
@@ -2830,8 +2819,6 @@ void ObjectMgr::LoadItemTemplates()
|
||||
itemTemplate.HolidayId = 0;
|
||||
}
|
||||
|
||||
ItemTemplateStore[entry] = itemTemplate;
|
||||
|
||||
++count;
|
||||
}
|
||||
while (result->NextRow());
|
||||
@@ -5768,13 +5755,11 @@ void ObjectMgr::LoadPageTexts()
|
||||
{
|
||||
Field* fields = result->Fetch();
|
||||
|
||||
PageText pageText;
|
||||
PageText& pageText = PageTextStore[fields[0].GetUInt32()];
|
||||
|
||||
pageText.Text = fields[1].GetString();
|
||||
pageText.NextPage = fields[2].GetInt16();
|
||||
|
||||
PageTextStore[fields[0].GetUInt32()] = pageText;
|
||||
|
||||
++count;
|
||||
}
|
||||
while (result->NextRow());
|
||||
@@ -7221,15 +7206,15 @@ void ObjectMgr::LoadGameObjectTemplate()
|
||||
|
||||
uint32 entry = fields[0].GetUInt32();
|
||||
|
||||
GameObjectTemplate got;
|
||||
GameObjectTemplate& got = GameObjectTemplateStore[entry];
|
||||
|
||||
got.entry = entry;
|
||||
got.type = uint32(fields[1].GetUInt8());
|
||||
got.displayId = fields[2].GetUInt32();
|
||||
got.name = fields[3].GetCString();
|
||||
got.IconName = fields[4].GetCString();
|
||||
got.castBarCaption = fields[5].GetCString();
|
||||
got.unk1 = fields[6].GetCString();
|
||||
got.name = fields[3].GetString();
|
||||
got.IconName = fields[4].GetString();
|
||||
got.castBarCaption = fields[5].GetString();
|
||||
got.unk1 = fields[6].GetString();
|
||||
got.faction = uint32(fields[7].GetUInt16());
|
||||
got.flags = fields[8].GetUInt32();
|
||||
got.size = fields[9].GetFloat();
|
||||
@@ -7244,7 +7229,7 @@ void ObjectMgr::LoadGameObjectTemplate()
|
||||
got.raw.data[i] = fields[16 + i].GetUInt32();
|
||||
}
|
||||
|
||||
got.AIName = fields[40].GetCString();
|
||||
got.AIName = fields[40].GetString();
|
||||
got.ScriptId = GetScriptId(fields[41].GetCString());
|
||||
|
||||
// Checks
|
||||
@@ -7378,10 +7363,7 @@ void ObjectMgr::LoadGameObjectTemplate()
|
||||
break;
|
||||
}
|
||||
|
||||
// Add to gameobject to map
|
||||
GameObjectTemplateStore[entry] = got;
|
||||
|
||||
++count;
|
||||
++count;
|
||||
}
|
||||
while (result->NextRow());
|
||||
|
||||
@@ -8466,7 +8448,7 @@ void ObjectMgr::LoadGameObjectForQuests()
|
||||
|
||||
mGameObjectForQuestSet.clear(); // need for reload case
|
||||
|
||||
if (!sObjectMgr->GetGameObjectTemplates()->empty())
|
||||
if (sObjectMgr->GetGameObjectTemplates()->empty())
|
||||
{
|
||||
sLog->outString(">> Loaded 0 GameObjects for quests");
|
||||
sLog->outString();
|
||||
|
||||
@@ -940,7 +940,7 @@ void Guild::BankMoveItemData::LogAction(MoveItemData* pFrom) const
|
||||
sLog->outCommand(m_pPlayer->GetSession()->GetAccountId(),
|
||||
"GM %s (Account: %u) deposit item: %s (Entry: %d Count: %u) to guild bank (Guild ID: %u)",
|
||||
m_pPlayer->GetName(), m_pPlayer->GetSession()->GetAccountId(),
|
||||
pFrom->GetItem()->GetTemplate()->Name1, pFrom->GetItem()->GetEntry(), pFrom->GetItem()->GetCount(),
|
||||
pFrom->GetItem()->GetTemplate()->Name1.c_str(), pFrom->GetItem()->GetEntry(), pFrom->GetItem()->GetCount(),
|
||||
m_pGuild->GetId());
|
||||
}
|
||||
|
||||
|
||||
@@ -207,7 +207,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
|
||||
if (GetSecurity() > SEC_PLAYER && sWorld->getBoolConfig(CONFIG_GM_LOG_TRADE))
|
||||
{
|
||||
sLog->outCommand(GetAccountId(),"GM %s (Account: %u) create auction: %s (Entry: %u Count: %u)",
|
||||
GetPlayerName(),GetAccountId(),it->GetTemplate()->Name1,it->GetEntry(),count);
|
||||
GetPlayerName(),GetAccountId(),it->GetTemplate()->Name1.c_str(),it->GetEntry(),count);
|
||||
}
|
||||
|
||||
pl->ModifyMoney(-int32(deposit));
|
||||
|
||||
@@ -249,7 +249,7 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data)
|
||||
if (GetSecurity() > SEC_PLAYER && sWorld->getBoolConfig(CONFIG_GM_LOG_TRADE))
|
||||
{
|
||||
sLog->outCommand(GetAccountId(), "GM %s (Account: %u) mail item: %s (Entry: %u Count: %u) to player: %s (Account: %u)",
|
||||
GetPlayerName(), GetAccountId(), item->GetTemplate()->Name1, item->GetEntry(), item->GetCount(), receiver.c_str(), rc_account);
|
||||
GetPlayerName(), GetAccountId(), item->GetTemplate()->Name1.c_str(), item->GetEntry(), item->GetCount(), receiver.c_str(), rc_account);
|
||||
}
|
||||
|
||||
item->SetNotRefundable(GetPlayer()); // makes the item no longer refundable
|
||||
@@ -460,7 +460,7 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recv_data)
|
||||
sender_name = sObjectMgr->GetTrinityStringForDBCLocale(LANG_UNKNOWN);
|
||||
}
|
||||
sLog->outCommand(GetAccountId(),"GM %s (Account: %u) receive mail item: %s (Entry: %u Count: %u) and send COD money: %u to player: %s (Account: %u)",
|
||||
GetPlayerName(),GetAccountId(),it->GetTemplate()->Name1,it->GetEntry(),it->GetCount(),m->COD,sender_name.c_str(),sender_accId);
|
||||
GetPlayerName(),GetAccountId(),it->GetTemplate()->Name1.c_str(), it->GetEntry(),it->GetCount(),m->COD,sender_name.c_str(),sender_accId);
|
||||
}
|
||||
else if (!receive)
|
||||
sender_accId = sObjectMgr->GetPlayerAccountIdByGUID(sender_guid);
|
||||
|
||||
@@ -238,7 +238,7 @@ void WorldSession::HandleGameObjectQueryOpcode(WorldPacket & recv_data)
|
||||
sObjectMgr->GetLocaleString(gl->CastBarCaption, loc_idx, CastBarCaption);
|
||||
}
|
||||
}
|
||||
sLog->outDetail("WORLD: CMSG_GAMEOBJECT_QUERY '%s' - Entry: %u. ", info->name, entry);
|
||||
sLog->outDetail("WORLD: CMSG_GAMEOBJECT_QUERY '%s' - Entry: %u. ", info->name.c_str(), entry);
|
||||
WorldPacket data (SMSG_GAMEOBJECT_QUERY_RESPONSE, 150);
|
||||
data << uint32(entry);
|
||||
data << uint32(info->type);
|
||||
|
||||
@@ -155,7 +155,7 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
|
||||
{
|
||||
sLog->outCommand(_player->GetSession()->GetAccountId(), "GM %s (Account: %u) trade: %s (Entry: %d Count: %u) to player: %s (Account: %u)",
|
||||
_player->GetName(), _player->GetSession()->GetAccountId(),
|
||||
myItems[i]->GetTemplate()->Name1, myItems[i]->GetEntry(), myItems[i]->GetCount(),
|
||||
myItems[i]->GetTemplate()->Name1.c_str(), myItems[i]->GetEntry(), myItems[i]->GetCount(),
|
||||
trader->GetName(), trader->GetSession()->GetAccountId());
|
||||
}
|
||||
|
||||
@@ -173,7 +173,7 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
|
||||
{
|
||||
sLog->outCommand(trader->GetSession()->GetAccountId(),"GM %s (Account: %u) trade: %s (Entry: %d Count: %u) to player: %s (Account: %u)",
|
||||
trader->GetName(), trader->GetSession()->GetAccountId(),
|
||||
hisItems[i]->GetTemplate()->Name1, hisItems[i]->GetEntry(), hisItems[i]->GetCount(),
|
||||
hisItems[i]->GetTemplate()->Name1.c_str(), hisItems[i]->GetEntry(), hisItems[i]->GetCount(),
|
||||
_player->GetName(), _player->GetSession()->GetAccountId());
|
||||
}
|
||||
|
||||
|
||||
@@ -3498,7 +3498,7 @@ void Spell::EffectEnchantItemPerm(SpellEffIndex effIndex)
|
||||
{
|
||||
sLog->outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)",
|
||||
p_caster->GetName(),p_caster->GetSession()->GetAccountId(),
|
||||
itemTarget->GetTemplate()->Name1,itemTarget->GetEntry(),
|
||||
itemTarget->GetTemplate()->Name1.c_str(), itemTarget->GetEntry(),
|
||||
item_owner->GetName(),item_owner->GetSession()->GetAccountId());
|
||||
}
|
||||
|
||||
@@ -3559,7 +3559,7 @@ void Spell::EffectEnchantItemPrismatic(SpellEffIndex effIndex)
|
||||
{
|
||||
sLog->outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)",
|
||||
p_caster->GetName(),p_caster->GetSession()->GetAccountId(),
|
||||
itemTarget->GetTemplate()->Name1,itemTarget->GetEntry(),
|
||||
itemTarget->GetTemplate()->Name1.c_str(), itemTarget->GetEntry(),
|
||||
item_owner->GetName(),item_owner->GetSession()->GetAccountId());
|
||||
}
|
||||
|
||||
@@ -3689,7 +3689,7 @@ void Spell::EffectEnchantItemTmp(SpellEffIndex effIndex)
|
||||
{
|
||||
sLog->outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(temp): %s (Entry: %d) for player: %s (Account: %u)",
|
||||
p_caster->GetName(), p_caster->GetSession()->GetAccountId(),
|
||||
itemTarget->GetTemplate()->Name1, itemTarget->GetEntry(),
|
||||
itemTarget->GetTemplate()->Name1.c_str(), itemTarget->GetEntry(),
|
||||
item_owner->GetName(), item_owner->GetSession()->GetAccountId());
|
||||
}
|
||||
|
||||
|
||||
@@ -177,7 +177,7 @@ public:
|
||||
// TODO: is it really necessary to add both the real and DB table guid here ?
|
||||
sObjectMgr->AddGameobjectToGrid(db_lowGUID, sObjectMgr->GetGOData(db_lowGUID));
|
||||
|
||||
handler->PSendSysMessage(LANG_GAMEOBJECT_ADD,id,gInfo->name,db_lowGUID,x,y,z);
|
||||
handler->PSendSysMessage(LANG_GAMEOBJECT_ADD,id,gInfo->name.c_str(),db_lowGUID,x,y,z);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -313,7 +313,7 @@ public:
|
||||
|
||||
GameObject* target = handler->GetSession()->GetPlayer()->GetMap()->GetGameObject(MAKE_NEW_GUID(lowguid,id,HIGHGUID_GAMEOBJECT));
|
||||
|
||||
handler->PSendSysMessage(LANG_GAMEOBJECT_DETAIL, lowguid, goI->name, lowguid, id, x, y, z, mapid, o, phase);
|
||||
handler->PSendSysMessage(LANG_GAMEOBJECT_DETAIL, lowguid, goI->name.c_str(), lowguid, id, x, y, z, mapid, o, phase);
|
||||
|
||||
if (target)
|
||||
{
|
||||
@@ -423,7 +423,7 @@ public:
|
||||
obj->SaveToDB();
|
||||
obj->Refresh();
|
||||
|
||||
handler->PSendSysMessage(LANG_COMMAND_TURNOBJMESSAGE, obj->GetGUIDLow(), obj->GetGOInfo()->name, obj->GetGUIDLow(), o);
|
||||
handler->PSendSysMessage(LANG_COMMAND_TURNOBJMESSAGE, obj->GetGUIDLow(), obj->GetGOInfo()->name.c_str(), obj->GetGUIDLow(), o);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -488,7 +488,7 @@ public:
|
||||
obj->SaveToDB();
|
||||
obj->Refresh();
|
||||
|
||||
handler->PSendSysMessage(LANG_COMMAND_MOVEOBJMESSAGE, obj->GetGUIDLow(), obj->GetGOInfo()->name, obj->GetGUIDLow());
|
||||
handler->PSendSysMessage(LANG_COMMAND_MOVEOBJMESSAGE, obj->GetGUIDLow(), obj->GetGOInfo()->name.c_str(), obj->GetGUIDLow());
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -561,7 +561,7 @@ public:
|
||||
if (!gInfo)
|
||||
continue;
|
||||
|
||||
handler->PSendSysMessage(LANG_GO_LIST_CHAT, guid, entry, guid, gInfo->name, x, y, z, mapid);
|
||||
handler->PSendSysMessage(LANG_GO_LIST_CHAT, guid, entry, guid, gInfo->name.c_str(), x, y, z, mapid);
|
||||
|
||||
++count;
|
||||
} while (result->NextRow());
|
||||
|
||||
@@ -203,7 +203,7 @@ public:
|
||||
|
||||
ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemId);
|
||||
|
||||
handler->PSendSysMessage(LANG_ITEM_ADDED_TO_LIST,itemId,itemTemplate->Name1,maxcount,incrtime,extendedcost);
|
||||
handler->PSendSysMessage(LANG_ITEM_ADDED_TO_LIST,itemId,itemTemplate->Name1.c_str(), maxcount,incrtime,extendedcost);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -421,7 +421,7 @@ public:
|
||||
|
||||
ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(itemId);
|
||||
|
||||
handler->PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST,itemId,itemTemplate->Name1);
|
||||
handler->PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST,itemId,itemTemplate->Name1.c_str());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user