From 2265aef916e3b2d63d87faa68a2b51e7d747c54c Mon Sep 17 00:00:00 2001 From: Seline Date: Tue, 14 Oct 2008 11:57:03 -0500 Subject: [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 --- src/game/ObjectGridLoader.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/game/ObjectGridLoader.h') diff --git a/src/game/ObjectGridLoader.h b/src/game/ObjectGridLoader.h index 26cc3543b60..fe527dc9c6e 100644 --- a/src/game/ObjectGridLoader.h +++ b/src/game/ObjectGridLoader.h @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS + * Copyright (C) 2008 Trinity + * + * Thanks to the original authors: MaNGOS * * 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,16 +10,16 @@ * * 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_OBJECTGRIDLOADER_H -#define MANGOS_OBJECTGRIDLOADER_H +#ifndef TRINITY_OBJECTGRIDLOADER_H +#define TRINITY_OBJECTGRIDLOADER_H #include "Utilities/TypeList.h" #include "Platform/Define.h" @@ -27,7 +29,7 @@ class ObjectWorldLoader; -class MANGOS_DLL_DECL ObjectGridLoader +class TRINITY_DLL_DECL ObjectGridLoader { friend class ObjectWorldLoader; @@ -54,7 +56,7 @@ class MANGOS_DLL_DECL ObjectGridLoader uint32 i_corpses; }; -class MANGOS_DLL_DECL ObjectGridUnloader +class TRINITY_DLL_DECL ObjectGridUnloader { public: ObjectGridUnloader(NGridType &grid) : i_grid(grid) {} @@ -78,7 +80,7 @@ class MANGOS_DLL_DECL ObjectGridUnloader NGridType &i_grid; }; -class MANGOS_DLL_DECL ObjectGridStoper +class TRINITY_DLL_DECL ObjectGridStoper { public: ObjectGridStoper(NGridType &grid) : i_grid(grid) {} -- cgit v1.2.3