Skip to content
This repository has been archived by the owner on Jul 27, 2020. It is now read-only.

Commit

Permalink
Core/DB: Renamed Strings,
Browse files Browse the repository at this point in the history 
(trinity_string -> skyfire_string)

Signed-off-by: Bootz <bootz@projectskyfire.org>
  • Loading branch information
@Bootz
Bootz committed Mar 19, 2012
1 parent 1305b6b commit ccb852b
Show file tree
Hide file tree
Showing 35 changed files with 958 additions and 193 deletions.
766 changes: 766 additions & 0 deletions sql/updates/world/2012_03_12_01_world_skyfire_string.sql
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion sql/updates/world/2012_03_12_01_world_trinity_string.sql
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
View file
Expand Up @@ -68,7 +68,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Texts(bool check_entry_use)
}

// range negative (don't must be happen, loaded from same table)
if (!sObjectMgr.GetTrinityStringLocale(i))
if (!sObjectMgr.GetSkyFireStringLocale(i))
{
sLog->outErrorDb("CreatureEventAI: Entry %i in table creature_ai_texts not found", i);
continue;
Expand Down
4 changes: 2 additions & 2 deletions src/server/game/AuctionHouse/AuctionHouseMgr.cpp
View file
Expand Up @@ -135,14 +135,14 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction)
if (bidder_security > SEC_PLAYER) // not do redundant DB requests
{
if (!sObjectMgr.GetPlayerNameByGUID(bidder_guid, bidder_name))
bidder_name = sObjectMgr.GetTrinityStringForDBCLocale(LANG_UNKNOWN);
bidder_name = sObjectMgr.GetSkyFireStringForDBCLocale(LANG_UNKNOWN);
}
}
if (bidder_security > SEC_PLAYER)
{
std::string owner_name;
if (!sObjectMgr.GetPlayerNameByGUID(auction->owner, owner_name))
owner_name = sObjectMgr.GetTrinityStringForDBCLocale(LANG_UNKNOWN);
owner_name = sObjectMgr.GetSkyFireStringForDBCLocale(LANG_UNKNOWN);

uint32 owner_accid = sObjectMgr.GetPlayerAccountIdByGUID(auction->owner);

Expand Down
14 changes: 7 additions & 7 deletions src/server/game/Battlegrounds/Battleground.cpp
View file
Expand Up @@ -40,7 +40,7 @@ namespace Trinity
: i_msgtype(msgtype), i_textId(textId), i_source(source), i_args(args) {}
void operator()(WorldPacket& data, int32 loc_idx)
{
char const* text = sObjectMgr.GetTrinityString(i_textId, loc_idx);
char const* text = sObjectMgr.GetSkyFireString(i_textId, loc_idx);

if (i_args)
{
Expand Down Expand Up @@ -85,9 +85,9 @@ namespace Trinity
: i_msgtype(msgtype), i_textId(textId), i_source(source), i_arg1(arg1), i_arg2(arg2) {}
void operator()(WorldPacket& data, int32 loc_idx)
{
char const* text = sObjectMgr.GetTrinityString(i_textId, loc_idx);
char const* arg1str = i_arg1 ? sObjectMgr.GetTrinityString(i_arg1, loc_idx) : "";
char const* arg2str = i_arg2 ? sObjectMgr.GetTrinityString(i_arg2, loc_idx) : "";
char const* text = sObjectMgr.GetSkyFireString(i_textId, loc_idx);
char const* arg1str = i_arg1 ? sObjectMgr.GetSkyFireString(i_arg1, loc_idx) : "";
char const* arg2str = i_arg2 ? sObjectMgr.GetSkyFireString(i_arg2, loc_idx) : "";

char str [2048];
snprintf(str, 2048, text, arg1str, arg2str );
Expand Down Expand Up @@ -929,7 +929,7 @@ void BattleGround::SendRewardMarkByMail(Player *plr, uint32 mark, uint32 count)
subject = il->Name[loc_idx];

// text
std::string textFormat = plr->GetSession()->GetTrinityString(LANG_BG_MARK_BY_MAIL);
std::string textFormat = plr->GetSession()->GetSkyFireString(LANG_BG_MARK_BY_MAIL);
char textBuf[300];
snprintf(textBuf, 300, textFormat.c_str(), GetName(), GetName());
uint32 itemTextId = sObjectMgr.CreateItemText(textBuf);
Expand Down Expand Up @@ -1699,10 +1699,10 @@ void BattleGround::EndNow()
}

// Battleground messages are localized using the dbc lang, they are not client language dependent
const char *BattleGround::GetTrinityString(int32 entry)
const char *BattleGround::GetSkyFireString(int32 entry)
{
// FIXME: now we have different DBC locales and need localized message for each target client
return sObjectMgr.GetTrinityStringForDBCLocale(entry);
return sObjectMgr.GetSkyFireStringForDBCLocale(entry);
}

/*
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Battlegrounds/Battleground.h
View file
Expand Up @@ -504,7 +504,7 @@ class BattleGround

void DoorOpen(uint32 type);
void DoorClose(uint32 type);
const char *GetTrinityString(int32 entry);
const char *GetSkyFireString(int32 entry);

virtual bool HandlePlayerUnderMap(Player * /*plr*/) { return false; }

Expand Down
44 changes: 22 additions & 22 deletions src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
View file
Expand Up @@ -95,7 +95,7 @@ void BattleGroundAV::HandleKillUnit(Creature *unit, Player *killer)
SpawnBGObject(BG_AV_OBJECT_BURN_BUILDING_ALLIANCE+i, RESPAWN_IMMEDIATELY);
Creature* creature = GetBGCreature(AV_CPLACE_HERALD);
if (creature)
YellToAll(creature, GetTrinityString(LANG_BG_AV_A_CAPTAIN_DEAD), LANG_UNIVERSAL);
YellToAll(creature, GetSkyFireString(LANG_BG_AV_A_CAPTAIN_DEAD), LANG_UNIVERSAL);
}
else if (entry == BG_AV_CreatureInfo[AV_NPC_H_CAPTAIN][0])
{
Expand All @@ -113,7 +113,7 @@ void BattleGroundAV::HandleKillUnit(Creature *unit, Player *killer)
SpawnBGObject(BG_AV_OBJECT_BURN_BUILDING_HORDE+i, RESPAWN_IMMEDIATELY);
Creature* creature = GetBGCreature(AV_CPLACE_HERALD);
if (creature)
YellToAll(creature, GetTrinityString(LANG_BG_AV_H_CAPTAIN_DEAD), LANG_UNIVERSAL);
YellToAll(creature, GetSkyFireString(LANG_BG_AV_H_CAPTAIN_DEAD), LANG_UNIVERSAL);
}
else if (entry == BG_AV_CreatureInfo[AV_NPC_N_MINE_N_4][0] || entry == BG_AV_CreatureInfo[AV_NPC_N_MINE_A_4][0] || entry == BG_AV_CreatureInfo[AV_NPC_N_MINE_H_4][0])
ChangeMineOwner(BG_AV_NORTH_MINE, killer->GetTeam());
Expand Down Expand Up @@ -570,9 +570,9 @@ void BattleGroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node)
//send a nice message to all :)
char buf[256];
if (IsTower(node))
sprintf(buf, GetTrinityString(LANG_BG_AV_TOWER_TAKEN) , GetNodeName(node), (owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE));
sprintf(buf, GetSkyFireString(LANG_BG_AV_TOWER_TAKEN) , GetNodeName(node), (owner == ALLIANCE) ? GetSkyFireString(LANG_BG_AV_ALLY) : GetSkyFireString(LANG_BG_AV_HORDE));
else
sprintf(buf, GetTrinityString(LANG_BG_AV_GRAVE_TAKEN) , GetNodeName(node), (owner == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) :GetTrinityString(LANG_BG_AV_HORDE));
sprintf(buf, GetSkyFireString(LANG_BG_AV_GRAVE_TAKEN) , GetNodeName(node), (owner == ALLIANCE) ? GetSkyFireString(LANG_BG_AV_ALLY) :GetSkyFireString(LANG_BG_AV_HORDE));

Creature* creature = GetBGCreature(AV_CPLACE_HERALD);
if (creature)
Expand Down Expand Up @@ -653,7 +653,7 @@ void BattleGroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial)
{
m_Mine_Reclaim_Timer[mine]=BG_AV_MINE_RECLAIM_TIMER;
char buf[256];
sprintf(buf, GetTrinityString(LANG_BG_AV_MINE_TAKEN), GetTrinityString((mine == BG_AV_NORTH_MINE) ? LANG_BG_AV_MINE_NORTH : LANG_BG_AV_MINE_SOUTH), (team == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE));
sprintf(buf, GetSkyFireString(LANG_BG_AV_MINE_TAKEN), GetSkyFireString((mine == BG_AV_NORTH_MINE) ? LANG_BG_AV_MINE_NORTH : LANG_BG_AV_MINE_SOUTH), (team == ALLIANCE) ? GetSkyFireString(LANG_BG_AV_ALLY) : GetSkyFireString(LANG_BG_AV_HORDE));
Creature* creature = GetBGCreature(AV_CPLACE_HERALD);
if (creature)
YellToAll(creature, buf, LANG_UNIVERSAL);
Expand Down Expand Up @@ -865,7 +865,7 @@ void BattleGroundAV::EventPlayerDefendsPoint(Player* player, uint32 object)
}
//send a nice message to all :)
char buf[256];
sprintf(buf, GetTrinityString((IsTower(node)) ? LANG_BG_AV_TOWER_DEFENDED : LANG_BG_AV_GRAVE_DEFENDED), GetNodeName(node), (team == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE));
sprintf(buf, GetSkyFireString((IsTower(node)) ? LANG_BG_AV_TOWER_DEFENDED : LANG_BG_AV_GRAVE_DEFENDED), GetNodeName(node), (team == ALLIANCE) ? GetSkyFireString(LANG_BG_AV_ALLY) : GetSkyFireString(LANG_BG_AV_HORDE));
Creature* creature = GetBGCreature(AV_CPLACE_HERALD);
if (creature)
YellToAll(creature, buf, LANG_UNIVERSAL);
Expand Down Expand Up @@ -974,7 +974,7 @@ void BattleGroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object)

//send a nice message to all :)
char buf[256];
sprintf(buf, (IsTower(node)) ? GetTrinityString(LANG_BG_AV_TOWER_ASSAULTED) : GetTrinityString(LANG_BG_AV_GRAVE_ASSAULTED), GetNodeName(node), (team == ALLIANCE) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE));
sprintf(buf, (IsTower(node)) ? GetSkyFireString(LANG_BG_AV_TOWER_ASSAULTED) : GetSkyFireString(LANG_BG_AV_GRAVE_ASSAULTED), GetNodeName(node), (team == ALLIANCE) ? GetSkyFireString(LANG_BG_AV_ALLY) : GetSkyFireString(LANG_BG_AV_HORDE));
Creature* creature = GetBGCreature(AV_CPLACE_HERALD);
if (creature)
YellToAll(creature, buf, LANG_UNIVERSAL);
Expand Down Expand Up @@ -1294,21 +1294,21 @@ const char* BattleGroundAV::GetNodeName(BG_AV_Nodes node)
{
switch (node)
{
case BG_AV_NODES_FIRSTAID_STATION: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_STORM_AID);
case BG_AV_NODES_DUNBALDAR_SOUTH: return GetTrinityString(LANG_BG_AV_NODE_TOWER_DUN_S);
case BG_AV_NODES_DUNBALDAR_NORTH: return GetTrinityString(LANG_BG_AV_NODE_TOWER_DUN_N);
case BG_AV_NODES_STORMPIKE_GRAVE: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_STORMPIKE);
case BG_AV_NODES_ICEWING_BUNKER: return GetTrinityString(LANG_BG_AV_NODE_TOWER_ICEWING);
case BG_AV_NODES_STONEHEART_GRAVE: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_STONE);
case BG_AV_NODES_STONEHEART_BUNKER: return GetTrinityString(LANG_BG_AV_NODE_TOWER_STONE);
case BG_AV_NODES_SNOWFALL_GRAVE: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_SNOW);
case BG_AV_NODES_ICEBLOOD_TOWER: return GetTrinityString(LANG_BG_AV_NODE_TOWER_ICE);
case BG_AV_NODES_ICEBLOOD_GRAVE: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_ICE);
case BG_AV_NODES_TOWER_POINT: return GetTrinityString(LANG_BG_AV_NODE_TOWER_POINT);
case BG_AV_NODES_FROSTWOLF_GRAVE: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_FROST);
case BG_AV_NODES_FROSTWOLF_ETOWER: return GetTrinityString(LANG_BG_AV_NODE_TOWER_FROST_E);
case BG_AV_NODES_FROSTWOLF_WTOWER: return GetTrinityString(LANG_BG_AV_NODE_TOWER_FROST_W);
case BG_AV_NODES_FROSTWOLF_HUT: return GetTrinityString(LANG_BG_AV_NODE_GRAVE_FROST_HUT);
case BG_AV_NODES_FIRSTAID_STATION: return GetSkyFireString(LANG_BG_AV_NODE_GRAVE_STORM_AID);
case BG_AV_NODES_DUNBALDAR_SOUTH: return GetSkyFireString(LANG_BG_AV_NODE_TOWER_DUN_S);
case BG_AV_NODES_DUNBALDAR_NORTH: return GetSkyFireString(LANG_BG_AV_NODE_TOWER_DUN_N);
case BG_AV_NODES_STORMPIKE_GRAVE: return GetSkyFireString(LANG_BG_AV_NODE_GRAVE_STORMPIKE);
case BG_AV_NODES_ICEWING_BUNKER: return GetSkyFireString(LANG_BG_AV_NODE_TOWER_ICEWING);
case BG_AV_NODES_STONEHEART_GRAVE: return GetSkyFireString(LANG_BG_AV_NODE_GRAVE_STONE);
case BG_AV_NODES_STONEHEART_BUNKER: return GetSkyFireString(LANG_BG_AV_NODE_TOWER_STONE);
case BG_AV_NODES_SNOWFALL_GRAVE: return GetSkyFireString(LANG_BG_AV_NODE_GRAVE_SNOW);
case BG_AV_NODES_ICEBLOOD_TOWER: return GetSkyFireString(LANG_BG_AV_NODE_TOWER_ICE);
case BG_AV_NODES_ICEBLOOD_GRAVE: return GetSkyFireString(LANG_BG_AV_NODE_GRAVE_ICE);
case BG_AV_NODES_TOWER_POINT: return GetSkyFireString(LANG_BG_AV_NODE_TOWER_POINT);
case BG_AV_NODES_FROSTWOLF_GRAVE: return GetSkyFireString(LANG_BG_AV_NODE_GRAVE_FROST);
case BG_AV_NODES_FROSTWOLF_ETOWER: return GetSkyFireString(LANG_BG_AV_NODE_TOWER_FROST_E);
case BG_AV_NODES_FROSTWOLF_WTOWER: return GetSkyFireString(LANG_BG_AV_NODE_TOWER_FROST_W);
case BG_AV_NODES_FROSTWOLF_HUT: return GetSkyFireString(LANG_BG_AV_NODE_GRAVE_FROST_HUT);
default:
sLog->outError("tried to get name for node %u", node);
break;
Expand Down
16 changes: 8 additions & 8 deletions src/server/game/Chat/Chat.cpp
View file
Expand Up @@ -315,7 +315,7 @@ ChatCommand * ChatHandler::getCommandTable()
{ "item_enchantment_template", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadItemEnchantementsCommand, "", NULL },
{ "item_loot_template", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadLootTemplatesItemCommand, "", NULL },
{ "mail_loot_template", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadLootTemplatesMailCommand, "", NULL },
{ "trinity_string", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadTrinityStringCommand, "", NULL },
{ "skyfire_string", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadSkyFireStringCommand, "", NULL },
{ "npc_gossip", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadNpcGossipCommand, "", NULL },
{ "npc_trainer", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadNpcTrainerCommand, "", NULL },
{ "npc_vendor", SEC_ADMINISTRATOR, true, &ChatHandler::HandleReloadNpcVendorCommand, "", NULL },
Expand Down Expand Up @@ -723,9 +723,9 @@ ChatCommand * ChatHandler::getCommandTable()
return commandTable;
}

const char *ChatHandler::GetTrinityString(int32 entry) const
const char *ChatHandler::GetSkyFireString(int32 entry) const
{
return m_session->GetTrinityString(entry);
return m_session->GetSkyFireString(entry);
}

bool ChatHandler::isAvailable(ChatCommand const& cmd) const
Expand Down Expand Up @@ -813,12 +813,12 @@ void ChatHandler::SendGlobalGMSysMessage(const char *str)

void ChatHandler::SendSysMessage(int32 entry)
{
SendSysMessage(GetTrinityString(entry));
SendSysMessage(GetSkyFireString(entry));
}

void ChatHandler::PSendSysMessage(int32 entry, ...)
{
const char *format = GetTrinityString(entry);
const char *format = GetSkyFireString(entry);
va_list ap;
char str [1024];
va_start(ap, entry);
Expand Down Expand Up @@ -1843,9 +1843,9 @@ bool ChatHandler::needReportToTarget(Player* chr) const
return pl != chr && pl->IsVisibleGloballyFor(chr);
}

const char *CliHandler::GetTrinityString(int32 entry) const
const char *CliHandler::GetSkyFireString(int32 entry) const
{
return sObjectMgr.GetTrinityStringForDBCLocale(entry);
return sObjectMgr.GetSkyFireStringForDBCLocale(entry);
}

bool CliHandler::isAvailable(ChatCommand const& cmd) const
Expand All @@ -1862,7 +1862,7 @@ void CliHandler::SendSysMessage(const char *str)

const char *CliHandler::GetName() const
{
return GetTrinityString(LANG_CONSOLE_COMMAND);
return GetSkyFireString(LANG_CONSOLE_COMMAND);
}

bool CliHandler::needReportToTarget(Player* /*chr*/) const
Expand Down
6 changes: 3 additions & 3 deletions src/server/game/Chat/Chat.h
View file
Expand Up @@ -63,7 +63,7 @@ class ChatHandler
static char* LineFromMessage(char*& pos) { char* start = strtok(pos, "\n"); pos = NULL; return start; }

// function with different implementation for chat/console
virtual const char *GetTrinityString(int32 entry) const;
virtual const char *GetSkyFireString(int32 entry) const;
virtual void SendSysMessage(const char *str);

char* extractQuotedArg(char* args);
Expand Down Expand Up @@ -272,7 +272,7 @@ class ChatHandler
bool HandleReloadLootTemplatesProspectingCommand(const char* args);
bool HandleReloadLootTemplatesReferenceCommand(const char* args);
bool HandleReloadLootTemplatesSkinningCommand(const char* args);
bool HandleReloadTrinityStringCommand(const char* args);
bool HandleReloadSkyFireStringCommand(const char* args);
bool HandleReloadNpcGossipCommand(const char* args);
bool HandleReloadNpcTrainerCommand(const char* args);
bool HandleReloadNpcVendorCommand(const char* args);
Expand Down Expand Up @@ -578,7 +578,7 @@ class CliHandler : public ChatHandler
explicit CliHandler(void* callbackArg, Print* zprint) : m_callbackArg(callbackArg), m_print(zprint) {}

// overwrite functions
const char *GetTrinityString(int32 entry) const;
const char *GetSkyFireString(int32 entry) const;
bool isAvailable(ChatCommand const& cmd) const;
void SendSysMessage(const char *str);
char const* GetName() const;
Expand Down

0 comments on commit ccb852b

Please sign in to comment.