Show
Ignore:
Timestamp:
11/19/08 13:27:40 (17 years ago)
Author:
yumileroy
Message:

[svn] * Merge Temp dev SVN with Assembla.
* Changes include:

  • Implementation of w12x's Outdoor PvP and Game Event Systems.
  • Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed).
  • All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql).
  • Improved Config cleanup.
  • And many more changes.

Original author: Seline
Date: 2008-10-14 11:57:03-05:00

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/game/BattleGround.cpp

    r9 r44  
    11/* 
    2  * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> 
     2 * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> 
     3 * 
     4 * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> 
    35 * 
    46 * This program is free software; you can redistribute it and/or modify 
     
    911 * This program is distributed in the hope that it will be useful, 
    1012 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
    1214 * GNU General Public License for more details. 
    1315 * 
    1416 * You should have received a copy of the GNU General Public License 
    1517 * along with this program; if not, write to the Free Software 
    16  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
     18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
    1719 */ 
    1820 
     
    433435    { 
    434436        if(isBattleGround()) 
    435             winmsg = GetMangosString(LANG_BG_A_WINS); 
     437            winmsg = GetTrinityString(LANG_BG_A_WINS); 
    436438        else 
    437             winmsg = GetMangosString(LANG_ARENA_GOLD_WINS); 
     439            winmsg = GetTrinityString(LANG_ARENA_GOLD_WINS); 
    438440 
    439441        PlaySoundToAll(SOUND_ALLIANCE_WINS);                // alliance wins sound 
     
    444446    { 
    445447        if(isBattleGround()) 
    446             winmsg = GetMangosString(LANG_BG_H_WINS); 
     448            winmsg = GetTrinityString(LANG_BG_H_WINS); 
    447449        else 
    448             winmsg = GetMangosString(LANG_ARENA_GREEN_WINS); 
     450            winmsg = GetTrinityString(LANG_ARENA_GREEN_WINS); 
    449451 
    450452        PlaySoundToAll(SOUND_HORDE_WINS);                   // horde wins sound 
     
    679681 
    680682        // text 
    681         std::string textFormat = plr->GetSession()->GetMangosString(LANG_BG_MARK_BY_MAIL); 
     683        std::string textFormat = plr->GetSession()->GetTrinityString(LANG_BG_MARK_BY_MAIL); 
    682684        char textBuf[300]; 
    683685        snprintf(textBuf,300,textFormat.c_str(),GetName(),GetName()); 
     
    13501352void BattleGround::SendMessageToAll(int32 entry) 
    13511353{ 
    1352     char const* text = GetMangosString(entry); 
     1354    char const* text = GetTrinityString(entry); 
    13531355    WorldPacket data; 
    13541356    ChatHandler::FillMessageData(&data, NULL, CHAT_MSG_BG_SYSTEM_NEUTRAL, LANG_UNIVERSAL, NULL, 0, text, NULL); 
     
    13661368 
    13671369// Battleground messages are localized using the dbc lang, they are not client language dependent 
    1368 const char *BattleGround::GetMangosString(int32 entry) 
     1370const char *BattleGround::GetTrinityString(int32 entry) 
    13691371{ 
    13701372    // FIXME: now we have different DBC locales and need localized message for each target client 
    1371     return objmgr.GetMangosStringForDBCLocale(entry); 
     1373    return objmgr.GetTrinityStringForDBCLocale(entry); 
    13721374} 
    13731375