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/Cell.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/game/Cell.h') diff --git a/src/game/Cell.h b/src/game/Cell.h index 873debabb14..a8c49d3fbf5 100644 --- a/src/game/Cell.h +++ b/src/game/Cell.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_CELL_H -#define MANGOS_CELL_H +#ifndef TRINITY_CELL_H +#define TRINITY_CELL_H #include "GameSystem/TypeContainer.h" #include "GameSystem/TypeContainerVisitor.h" @@ -42,7 +44,7 @@ enum District template struct CellLock; -struct MANGOS_DLL_DECL Cell +struct TRINITY_DLL_DECL Cell { Cell() { data.All = 0; } Cell(const Cell &cell) { data.All = cell.data.All; } @@ -143,7 +145,7 @@ struct MANGOS_DLL_DECL Cell }; template -struct MANGOS_DLL_DECL CellLock +struct TRINITY_DLL_DECL CellLock { const Cell& i_cell; const CellPair &i_cellPair; -- cgit v1.2.3