Changeset 44 for trunk/src/game/BattleGroundEY.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/BattleGroundEY.cpp (modified) (14 diffs)

trunk/src/game/BattleGroundEY.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
  */
 
@@ -75 +77 @@
         {
             m_Events |= 0x04;
-            SendMessageToAll(GetMangosString(LANG_BG_EY_ONE_MINUTE));
+            SendMessageToAll(GetTrinityString(LANG_BG_EY_ONE_MINUTE));
         }
         // After 1,5 minute, warning is signalled
@@ -81 +83 @@
         {
             m_Events |= 0x08;
-            SendMessageToAll(GetMangosString(LANG_BG_EY_HALF_MINUTE));
+            SendMessageToAll(GetTrinityString(LANG_BG_EY_HALF_MINUTE));
         }
         // After 2 minutes, gates OPEN ! x)
@@ -99 +101 @@
             }
 
-            SendMessageToAll(GetMangosString(LANG_BG_EY_BEGIN));
-
+            SendMessageToAll(GetTrinityString(LANG_BG_EY_BEGIN));
+
+            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);
             SetStatus(STATUS_IN_PROGRESS);
 
@@ -556 +554 @@
     if(send_message)
     {
-        SendMessageToAll(GetMangosString(LANG_BG_EY_RESETED_FLAG));
+        SendMessageToAll(GetTrinityString(LANG_BG_EY_RESETED_FLAG));
         PlaySoundToAll(BG_EY_SOUND_FLAG_RESET);             // flags respawned sound...
     }
@@ -616 +614 @@
     if(Source->GetTeam() == ALLIANCE)
     {
-        message = GetMangosString(LANG_BG_EY_DROPPED_FLAG);
+        message = GetTrinityString(LANG_BG_EY_DROPPED_FLAG);
         type = CHAT_MSG_BG_SYSTEM_ALLIANCE;
     }
     else
     {
-        message = GetMangosString(LANG_BG_EY_DROPPED_FLAG);
+        message = GetTrinityString(LANG_BG_EY_DROPPED_FLAG);
         type = CHAT_MSG_BG_SYSTEM_HORDE;
     }
@@ -640 +638 @@
     const char *message;
     uint8 type = 0;
-    message = GetMangosString(LANG_BG_EY_HAS_TAKEN_FLAG);
+    message = GetTrinityString(LANG_BG_EY_HAS_TAKEN_FLAG);
 
     if(Source->GetTeam() == ALLIANCE)
@@ -687 +685 @@
         m_TeamPointsCount[BG_TEAM_ALLIANCE]--;
         message_type = CHAT_MSG_BG_SYSTEM_ALLIANCE;
-        message = GetMangosString(m_LoosingPointTypes[Point].MessageIdAlliance);
+        message = GetTrinityString(m_LoosingPointTypes[Point].MessageIdAlliance);
         SpawnBGObject(m_LoosingPointTypes[Point].DespawnObjectTypeAlliance, RESPAWN_ONE_DAY);
         SpawnBGObject(m_LoosingPointTypes[Point].DespawnObjectTypeAlliance + 1, RESPAWN_ONE_DAY);
@@ -696 +694 @@
         m_TeamPointsCount[BG_TEAM_HORDE]--;
         message_type = CHAT_MSG_BG_SYSTEM_HORDE;
-        message = GetMangosString(m_LoosingPointTypes[Point].MessageIdHorde);
+        message = GetTrinityString(m_LoosingPointTypes[Point].MessageIdHorde);
         SpawnBGObject(m_LoosingPointTypes[Point].DespawnObjectTypeHorde, RESPAWN_ONE_DAY);
         SpawnBGObject(m_LoosingPointTypes[Point].DespawnObjectTypeHorde + 1, RESPAWN_ONE_DAY);
@@ -736 +734 @@
         m_TeamPointsCount[BG_TEAM_ALLIANCE]++;
         type = CHAT_MSG_BG_SYSTEM_ALLIANCE;
-        message = GetMangosString(m_CapturingPointTypes[Point].MessageIdAlliance);
+        message = GetTrinityString(m_CapturingPointTypes[Point].MessageIdAlliance);
         SpawnBGObject(m_CapturingPointTypes[Point].SpawnObjectTypeAlliance, RESPAWN_IMMEDIATELY);
         SpawnBGObject(m_CapturingPointTypes[Point].SpawnObjectTypeAlliance + 1, RESPAWN_IMMEDIATELY);
@@ -745 +743 @@
         m_TeamPointsCount[BG_TEAM_HORDE]++;
         type = CHAT_MSG_BG_SYSTEM_HORDE;
-        message = GetMangosString(m_CapturingPointTypes[Point].MessageIdHorde);
+        message = GetTrinityString(m_CapturingPointTypes[Point].MessageIdHorde);
         SpawnBGObject(m_CapturingPointTypes[Point].SpawnObjectTypeHorde, RESPAWN_IMMEDIATELY);
         SpawnBGObject(m_CapturingPointTypes[Point].SpawnObjectTypeHorde + 1, RESPAWN_IMMEDIATELY);
@@ -790 +788 @@
         PlaySoundToAll(BG_EY_SOUND_FLAG_CAPTURED_ALLIANCE);
         team_id = BG_TEAM_ALLIANCE;
-        message = GetMangosString(LANG_BG_EY_CAPTURED_FLAG_A);
+        message = GetTrinityString(LANG_BG_EY_CAPTURED_FLAG_A);
         type = CHAT_MSG_BG_SYSTEM_ALLIANCE;
     }
@@ -797 +795 @@
         PlaySoundToAll(BG_EY_SOUND_FLAG_CAPTURED_HORDE);
         team_id = BG_TEAM_HORDE;
-        message = GetMangosString(LANG_BG_EY_CAPTURED_FLAG_H);
+        message = GetTrinityString(LANG_BG_EY_CAPTURED_FLAG_H);
         type = CHAT_MSG_BG_SYSTEM_HORDE;
     }