Copyright header updates - part 3... (and some whitespace cleanups)

--HG--
branch : trunk

7 files changed, 186 insertions, 185 deletions

diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp
index 3e90e3fa01a..afc4a4c9460 100644..100755
--- a/src/server/game/Battlegrounds/ArenaTeam.cpp
+++ b/src/server/game/Battlegrounds/ArenaTeam.cpp
@@ -1,19 +1,19 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- * 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
+/*

+ * Copyright (C) 2008-2010 TrinityCore <http://www.trinitycore.org/>

+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>

+ *

+ * This program is free software; you can redistribute it and/or modify it

+ * under the terms of the GNU General Public License as published by the

+ * Free Software Foundation; either version 2 of the License, or (at your

+ * option) any later version.

+ *

+ * 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 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, see <http://www.gnu.org/licenses/>.

  */
 
 #include "ObjectMgr.h"
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
index c2145a4e019..6159c4691f8 100644..100755
--- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
@@ -1,19 +1,19 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- * 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
+/*

+ * Copyright (C) 2008-2010 TrinityCore <http://www.trinitycore.org/>

+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>

+ *

+ * This program is free software; you can redistribute it and/or modify it

+ * under the terms of the GNU General Public License as published by the

+ * Free Software Foundation; either version 2 of the License, or (at your

+ * option) any later version.

+ *

+ * 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 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, see <http://www.gnu.org/licenses/>.

  */
 
 #include "Battleground.h"
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h
index a9127e262f5..24a5431306e 100644..100755
--- a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h
@@ -1,89 +1,90 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- * 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
- */
-#ifndef __BATTLEGROUNDDS_H
-#define __BATTLEGROUNDDS_H
-
-class Battleground;
-
-enum BattlegroundDSObjectTypes
-{
-    BG_DS_OBJECT_DOOR_1         = 0,
-    BG_DS_OBJECT_DOOR_2         = 1,
-    BG_DS_OBJECT_WATER_1        = 2,
-    BG_DS_OBJECT_WATER_2        = 3,
-    BG_DS_OBJECT_BUFF_1         = 4,
-    BG_DS_OBJECT_BUFF_2         = 5,
-    BG_DS_OBJECT_MAX            = 6
-};
-
-enum BattlegroundDSObjects
-{
-    BG_DS_OBJECT_TYPE_DOOR_1    = 192642,
-    BG_DS_OBJECT_TYPE_DOOR_2    = 192643,
-    BG_DS_OBJECT_TYPE_WATER_1   = 194395,
-    BG_DS_OBJECT_TYPE_WATER_2   = 191877,
-    BG_DS_OBJECT_TYPE_BUFF_1    = 184663,
-    BG_DS_OBJECT_TYPE_BUFF_2    = 184664
-};
-
-enum BattlegroundDSData
-{ // These values are NOT blizzlike... need the correct data!
-    BG_DS_WATERFALL_TIMER_MIN                    = 30000,
-    BG_DS_WATERFALL_TIMER_MAX                    = 60000,
-    BG_DS_WATERFALL_DURATION                     = 10000,
-};
-
-class BattlegroundDSScore : public BattlegroundScore
-{
-    public:
-        BattlegroundDSScore() {};
-        virtual ~BattlegroundDSScore() {};
-        //TODO fix me
-};
-
-class BattlegroundDS : public Battleground
-{
-    friend class BattlegroundMgr;
-
-    public:
-        BattlegroundDS();
-        ~BattlegroundDS();
-        void Update(uint32 diff);
-
-        /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player *plr);
-        virtual void StartingEventCloseDoors();
-        virtual void StartingEventOpenDoors();
-
-        void RemovePlayer(Player *plr, uint64 guid);
-        void HandleAreaTrigger(Player *Source, uint32 Trigger);
-        bool SetupBattleground();
-        virtual void Reset();
-        virtual void FillInitialWorldStates(WorldPacket &d);
-        void HandleKillPlayer(Player* player, Player *killer);
-        bool HandlePlayerUnderMap(Player * plr);
-    private:
-        uint32 m_waterTimer;
-        bool m_waterfallActive;
-    protected:
-        bool isWaterFallActive() { return m_waterfallActive; };
-        void setWaterFallActive(bool active) { m_waterfallActive = active; };
-        void setWaterFallTimer(uint32 timer) { m_waterTimer = timer; };
-        uint32 getWaterFallTimer() { return m_waterTimer; };
-};
-#endif
+/*

+ * Copyright (C) 2008-2010 TrinityCore <http://www.trinitycore.org/>

+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>

+ *

+ * This program is free software; you can redistribute it and/or modify it

+ * under the terms of the GNU General Public License as published by the

+ * Free Software Foundation; either version 2 of the License, or (at your

+ * option) any later version.

+ *

+ * 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 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, see <http://www.gnu.org/licenses/>.

+ */

+

+#ifndef __BATTLEGROUNDDS_H

+#define __BATTLEGROUNDDS_H

+

+class Battleground;

+

+enum BattlegroundDSObjectTypes

+{

+    BG_DS_OBJECT_DOOR_1         = 0,

+    BG_DS_OBJECT_DOOR_2         = 1,

+    BG_DS_OBJECT_WATER_1        = 2,

+    BG_DS_OBJECT_WATER_2        = 3,

+    BG_DS_OBJECT_BUFF_1         = 4,

+    BG_DS_OBJECT_BUFF_2         = 5,

+    BG_DS_OBJECT_MAX            = 6

+};

+

+enum BattlegroundDSObjects

+{

+    BG_DS_OBJECT_TYPE_DOOR_1    = 192642,

+    BG_DS_OBJECT_TYPE_DOOR_2    = 192643,

+    BG_DS_OBJECT_TYPE_WATER_1   = 194395,

+    BG_DS_OBJECT_TYPE_WATER_2   = 191877,

+    BG_DS_OBJECT_TYPE_BUFF_1    = 184663,

+    BG_DS_OBJECT_TYPE_BUFF_2    = 184664

+};

+

+enum BattlegroundDSData

+{ // These values are NOT blizzlike... need the correct data!

+    BG_DS_WATERFALL_TIMER_MIN                    = 30000,

+    BG_DS_WATERFALL_TIMER_MAX                    = 60000,

+    BG_DS_WATERFALL_DURATION                     = 10000,

+};

+

+class BattlegroundDSScore : public BattlegroundScore

+{

+    public:

+        BattlegroundDSScore() {};

+        virtual ~BattlegroundDSScore() {};

+        //TODO fix me

+};

+

+class BattlegroundDS : public Battleground

+{

+    friend class BattlegroundMgr;

+

+    public:

+        BattlegroundDS();

+        ~BattlegroundDS();

+        void Update(uint32 diff);

+

+        /* inherited from BattlegroundClass */

+        virtual void AddPlayer(Player *plr);

+        virtual void StartingEventCloseDoors();

+        virtual void StartingEventOpenDoors();

+

+        void RemovePlayer(Player *plr, uint64 guid);

+        void HandleAreaTrigger(Player *Source, uint32 Trigger);

+        bool SetupBattleground();

+        virtual void Reset();

+        virtual void FillInitialWorldStates(WorldPacket &d);

+        void HandleKillPlayer(Player* player, Player *killer);

+        bool HandlePlayerUnderMap(Player * plr);

+    private:

+        uint32 m_waterTimer;

+        bool m_waterfallActive;

+    protected:

+        bool isWaterFallActive() { return m_waterfallActive; };

+        void setWaterFallActive(bool active) { m_waterfallActive = active; };

+        void setWaterFallTimer(uint32 timer) { m_waterTimer = timer; };

+        uint32 getWaterFallTimer() { return m_waterTimer; };

+};

+#endif

diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
index d7579f52745..6d577e099c2 100644..100755
--- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
@@ -1,19 +1,19 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- * 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
+/*

+ * Copyright (C) 2008-2010 TrinityCore <http://www.trinitycore.org/>

+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>

+ *

+ * This program is free software; you can redistribute it and/or modify it

+ * under the terms of the GNU General Public License as published by the

+ * Free Software Foundation; either version 2 of the License, or (at your

+ * option) any later version.

+ *

+ * 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 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, see <http://www.gnu.org/licenses/>.

  */
 
 #include "Player.h"
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h
index dff30105b94..98d0f389e13 100644..100755
--- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h
@@ -1,19 +1,19 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- * 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
+/*

+ * Copyright (C) 2008-2010 TrinityCore <http://www.trinitycore.org/>

+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>

+ *

+ * This program is free software; you can redistribute it and/or modify it

+ * under the terms of the GNU General Public License as published by the

+ * Free Software Foundation; either version 2 of the License, or (at your

+ * option) any later version.

+ *

+ * 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 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, see <http://www.gnu.org/licenses/>.

  */
 
 #ifndef __BATTLEGROUNDIC_H
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
index 8ee0064a440..7d5dc1a9323 100644..100755
--- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
@@ -1,19 +1,19 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- * 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
+/*

+ * Copyright (C) 2008-2010 TrinityCore <http://www.trinitycore.org/>

+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>

+ *

+ * This program is free software; you can redistribute it and/or modify it

+ * under the terms of the GNU General Public License as published by the

+ * Free Software Foundation; either version 2 of the License, or (at your

+ * option) any later version.

+ *

+ * 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 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, see <http://www.gnu.org/licenses/>.

  */
 
 #include "Battleground.h"
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h
index bc4c7d2f52c..b61260c3c94 100644..100755
--- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h
@@ -1,19 +1,19 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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
- * 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
+/*

+ * Copyright (C) 2008-2010 TrinityCore <http://www.trinitycore.org/>

+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>

+ *

+ * This program is free software; you can redistribute it and/or modify it

+ * under the terms of the GNU General Public License as published by the

+ * Free Software Foundation; either version 2 of the License, or (at your

+ * option) any later version.

+ *

+ * 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 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, see <http://www.gnu.org/licenses/>.

  */
 
 #ifndef __BATTLEGROUNDSA_H