Changeset 44 for trunk/src/game/BattleGroundAB.cpp

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:

• trunk/src/game/BattleGroundAB.cpp (modified) (14 diffs)

trunk/src/game/BattleGroundAB.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
+ * Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
+ *
+ * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -9 +11 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
@@ -83 +85 @@
         {
             m_Events |= 0x04;
-            SendMessageToAll(GetMangosString(LANG_BG_AB_ONEMINTOSTART));
+            SendMessageToAll(GetTrinityString(LANG_BG_AB_ONEMINTOSTART));
         }
         // After 1,5 minute, warning is signalled
@@ -89 +91 @@
         {
             m_Events |= 0x08;
-            SendMessageToAll(GetMangosString(LANG_BG_AB_HALFMINTOSTART));
+            SendMessageToAll(GetTrinityString(LANG_BG_AB_HALFMINTOSTART));
         }
         // After 2 minutes, gates OPEN ! x)
@@ -95 +97 @@
         {
             m_Events |= 0x10;
-            SendMessageToAll(GetMangosString(LANG_BG_AB_STARTED));
+            SendMessageToAll(GetTrinityString(LANG_BG_AB_STARTED));
 
             // spawn neutral banners
@@ -109 +111 @@
             DoorOpen(BG_AB_OBJECT_GATE_H);
 
+            PlaySoundToAll(SOUND_BG_START);
             if(sWorld.getConfig(CONFIG_BG_START_MUSIC))
-                        {
-                                PlaySoundToAll(SOUND_BG_START);
-                                PlaySoundToAll(SOUND_BG_START_L70ETC); //MUSIC
-                        }
-                        else
-                                PlaySoundToAll(SOUND_BG_START);
+                PlaySoundToAll(SOUND_BG_START_L70ETC); //MUSIC
             SetStatus(STATUS_IN_PROGRESS);
 
@@ -163 +161 @@
                     char buf[256];
                     uint8 type = (teamIndex == 0) ? CHAT_MSG_BG_SYSTEM_ALLIANCE : CHAT_MSG_BG_SYSTEM_HORDE;
-                    sprintf(buf, GetMangosString(LANG_BG_AB_NODE_TAKEN), (teamIndex == 0) ? GetMangosString(LANG_BG_AB_ALLY) : GetMangosString(LANG_BG_AB_HORDE), _GetNodeName(node));
+                    sprintf(buf, GetTrinityString(LANG_BG_AB_NODE_TAKEN), (teamIndex == 0) ? GetTrinityString(LANG_BG_AB_ALLY) : GetTrinityString(LANG_BG_AB_HORDE), _GetNodeName(node));
                     WorldPacket data;
                     ChatHandler::FillMessageData(&data, NULL, type, LANG_UNIVERSAL, NULL, 0, buf, NULL);
@@ -202 +200 @@
                 {
                     if( team == BG_TEAM_ALLIANCE )
-                        SendMessageToAll(GetMangosString(LANG_BG_AB_A_NEAR_VICTORY));
+                        SendMessageToAll(GetTrinityString(LANG_BG_AB_A_NEAR_VICTORY));
                     else
-                        SendMessageToAll(GetMangosString(LANG_BG_AB_H_NEAR_VICTORY));
+                        SendMessageToAll(GetTrinityString(LANG_BG_AB_H_NEAR_VICTORY));
                     PlaySoundToAll(SOUND_NEAR_VICTORY);
                     m_IsInformedNearVictory = true;
@@ -315 +313 @@
     {
         case BG_AB_NODE_STABLES:
-            return GetMangosString(LANG_BG_AB_NODE_STABLES);
+            return GetTrinityString(LANG_BG_AB_NODE_STABLES);
         case BG_AB_NODE_BLACKSMITH:
-            return GetMangosString(LANG_BG_AB_NODE_BLACKSMITH);
+            return GetTrinityString(LANG_BG_AB_NODE_BLACKSMITH);
         case BG_AB_NODE_FARM:
-            return GetMangosString(LANG_BG_AB_NODE_FARM);
+            return GetTrinityString(LANG_BG_AB_NODE_FARM);
         case BG_AB_NODE_LUMBER_MILL:
-            return GetMangosString(LANG_BG_AB_NODE_LUMBER_MILL);
+            return GetTrinityString(LANG_BG_AB_NODE_LUMBER_MILL);
         case BG_AB_NODE_GOLD_MINE:
-            return GetMangosString(LANG_BG_AB_NODE_GOLD_MINE);
+            return GetTrinityString(LANG_BG_AB_NODE_GOLD_MINE);
         default:
             ASSERT(0);
@@ -478 +476 @@
         _SendNodeUpdate(node);
         m_NodeTimers[node] = BG_AB_FLAG_CAPTURING_TIME;
-        sprintf(buf, GetMangosString(LANG_BG_AB_NODE_CLAIMED), _GetNodeName(node), (teamIndex == 0) ? GetMangosString(LANG_BG_AB_ALLY) : GetMangosString(LANG_BG_AB_HORDE));
+        sprintf(buf, GetTrinityString(LANG_BG_AB_NODE_CLAIMED), _GetNodeName(node), (teamIndex == 0) ? GetTrinityString(LANG_BG_AB_ALLY) : GetTrinityString(LANG_BG_AB_HORDE));
         sound = SOUND_NODE_CLAIMED;
     }
@@ -496 +494 @@
             _SendNodeUpdate(node);
             m_NodeTimers[node] = BG_AB_FLAG_CAPTURING_TIME;
-            sprintf(buf, GetMangosString(LANG_BG_AB_NODE_ASSAULTED), _GetNodeName(node));
+            sprintf(buf, GetTrinityString(LANG_BG_AB_NODE_ASSAULTED), _GetNodeName(node));
         }
         // If contested, change back to occupied
@@ -511 +509 @@
             m_NodeTimers[node] = 0;
             _NodeOccupied(node,(teamIndex == 0) ? ALLIANCE:HORDE);
-            sprintf(buf, GetMangosString(LANG_BG_AB_NODE_DEFENDED), _GetNodeName(node));
+            sprintf(buf, GetTrinityString(LANG_BG_AB_NODE_DEFENDED), _GetNodeName(node));
         }
         sound = (teamIndex == 0) ? SOUND_NODE_ASSAULTED_ALLIANCE : SOUND_NODE_ASSAULTED_HORDE;
@@ -528 +526 @@
         _NodeDeOccupied(node);
         m_NodeTimers[node] = BG_AB_FLAG_CAPTURING_TIME;
-        sprintf(buf, GetMangosString(LANG_BG_AB_NODE_ASSAULTED), _GetNodeName(node));
+        sprintf(buf, GetTrinityString(LANG_BG_AB_NODE_ASSAULTED), _GetNodeName(node));
         sound = (teamIndex == 0) ? SOUND_NODE_ASSAULTED_ALLIANCE : SOUND_NODE_ASSAULTED_HORDE;
     }
@@ -537 +535 @@
     if( m_Nodes[node] >= BG_AB_NODE_TYPE_OCCUPIED )
     {
-        sprintf(buf, GetMangosString(LANG_BG_AB_NODE_TAKEN), (teamIndex == 0) ? GetMangosString(LANG_BG_AB_ALLY) : GetMangosString(LANG_BG_AB_HORDE), _GetNodeName(node));
+        sprintf(buf, GetTrinityString(LANG_BG_AB_NODE_TAKEN), (teamIndex == 0) ? GetTrinityString(LANG_BG_AB_ALLY) : GetTrinityString(LANG_BG_AB_HORDE), _GetNodeName(node));
         ChatHandler::FillMessageData(&data, NULL, type, LANG_UNIVERSAL, NULL, 0, buf, NULL);
         SendPacketToAll(&data);