[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. --HG-- branch : trunk
This commit is contained in:
+13
-11
@@ -1,5 +1,7 @@
|
||||
/*
|
||||
* 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
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@@ -8,23 +10,23 @@
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
#ifndef MANGOS_GRIDSTATES_H
|
||||
#define MANGOS_GRIDSTATES_H
|
||||
#ifndef TRINITY_GRIDSTATES_H
|
||||
#define TRINITY_GRIDSTATES_H
|
||||
|
||||
#include "Map.h"
|
||||
|
||||
class MANGOS_DLL_DECL GridState
|
||||
class TRINITY_DLL_DECL GridState
|
||||
{
|
||||
public:
|
||||
#ifdef MANGOS_DEBUG
|
||||
#ifdef TRINITY_DEBUG
|
||||
#define MAGIC_TESTVAL 0xFBE823BA
|
||||
GridState() { i_Magic = MAGIC_TESTVAL; }
|
||||
bool checkMagic()
|
||||
@@ -42,28 +44,28 @@ class MANGOS_DLL_DECL GridState
|
||||
virtual void Update(Map &, NGridType&, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const = 0;
|
||||
};
|
||||
|
||||
class MANGOS_DLL_DECL InvalidState : public GridState
|
||||
class TRINITY_DLL_DECL InvalidState : public GridState
|
||||
{
|
||||
public:
|
||||
|
||||
void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
|
||||
};
|
||||
|
||||
class MANGOS_DLL_DECL ActiveState : public GridState
|
||||
class TRINITY_DLL_DECL ActiveState : public GridState
|
||||
{
|
||||
public:
|
||||
|
||||
void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
|
||||
};
|
||||
|
||||
class MANGOS_DLL_DECL IdleState : public GridState
|
||||
class TRINITY_DLL_DECL IdleState : public GridState
|
||||
{
|
||||
public:
|
||||
|
||||
void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
|
||||
};
|
||||
|
||||
class MANGOS_DLL_DECL RemovalState : public GridState
|
||||
class TRINITY_DLL_DECL RemovalState : public GridState
|
||||
{
|
||||
public:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user