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/shared/vmap/VMapManager.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/shared/vmap/VMapManager.h') diff --git a/src/shared/vmap/VMapManager.h b/src/shared/vmap/VMapManager.h index aef9e0fa8f1..e0bb4aecb77 100644 --- a/src/shared/vmap/VMapManager.h +++ b/src/shared/vmap/VMapManager.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,12 +10,12 @@ * * 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 _VMAPMANAGER_H @@ -143,7 +145,7 @@ namespace VMAP public: // public for debug G3D::Vector3 convertPositionToInternalRep(float x, float y, float z) const; - G3D::Vector3 convertPositionToMangosRep(float x, float y, float z) const; + G3D::Vector3 convertPositionToTrinityRep(float x, float y, float z) const; std::string getDirFileName(unsigned int pMapId) const; std::string getDirFileName(unsigned int pMapId, int x, int y) const; MapTree* getInstanceMapTree(int pMapId) { return(iInstanceMapTrees.get(pMapId)); } -- cgit v1.2.3