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/GridStates.h

    r2 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 
    19 #ifndef MANGOS_GRIDSTATES_H 
    20 #define MANGOS_GRIDSTATES_H 
     21#ifndef TRINITY_GRIDSTATES_H 
     22#define TRINITY_GRIDSTATES_H 
    2123 
    2224#include "Map.h" 
    2325 
    24 class MANGOS_DLL_DECL GridState 
     26class TRINITY_DLL_DECL GridState 
    2527{ 
    2628    public: 
    27 #ifdef MANGOS_DEBUG 
     29#ifdef TRINITY_DEBUG 
    2830#define MAGIC_TESTVAL 0xFBE823BA 
    2931        GridState() { i_Magic = MAGIC_TESTVAL; } 
     
    4345}; 
    4446 
    45 class MANGOS_DLL_DECL InvalidState : public GridState 
     47class TRINITY_DLL_DECL InvalidState : public GridState 
    4648{ 
    4749    public: 
     
    5052}; 
    5153 
    52 class MANGOS_DLL_DECL ActiveState : public GridState 
     54class TRINITY_DLL_DECL ActiveState : public GridState 
    5355{ 
    5456    public: 
     
    5759}; 
    5860 
    59 class MANGOS_DLL_DECL IdleState : public GridState 
     61class TRINITY_DLL_DECL IdleState : public GridState 
    6062{ 
    6163    public: 
     
    6466}; 
    6567 
    66 class MANGOS_DLL_DECL RemovalState : public GridState 
     68class TRINITY_DLL_DECL RemovalState : public GridState 
    6769{ 
    6870    public: