diff options
Diffstat (limited to 'src/shared/vmap/VMapFactory.cpp')
| -rw-r--r-- | src/shared/vmap/VMapFactory.cpp | 45 |
1 files changed, 34 insertions, 11 deletions
diff --git a/src/shared/vmap/VMapFactory.cpp b/src/shared/vmap/VMapFactory.cpp index 2c5cd19d5dd..331acbace47 100644 --- a/src/shared/vmap/VMapFactory.cpp +++ b/src/shared/vmap/VMapFactory.cpp @@ -1,7 +1,5 @@ /* - * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> - * - * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> + * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/> * * 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 @@ -10,25 +8,51 @@ * * 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 */ #include <sys/types.h> #include "VMapFactory.h" -#include "VMapManager.h" +#include "VMapManager2.h" using namespace G3D; namespace VMAP { - extern void chompAndTrim(std::string& str); + void chompAndTrim(std::string& str) + { + while(str.length() >0) + { + char lc = str[str.length()-1]; + if(lc == '\r' || lc == '\n' || lc == ' ' || lc == '"' || lc == '\'') + { + str = str.substr(0,str.length()-1); + } + else + { + break; + } + } + while(str.length() >0) + { + char lc = str[0]; + if(lc == ' ' || lc == '"' || lc == '\'') + { + str = str.substr(1,str.length()-1); + } + else + { + break; + } + } + } - VMapManager *gVMapManager = 0; + IVMapManager *gVMapManager = 0; Table<unsigned int , bool>* iIgnoreSpellIds=0; //=============================================== @@ -38,7 +62,7 @@ namespace VMAP { bool result = false; unsigned int i; - for (i=pStartPos; i<pString.size(); ++i) + for(i=pStartPos;i<pString.size(); ++i) { if(pString[i] == ',') { @@ -90,7 +114,7 @@ namespace VMAP IVMapManager* VMapFactory::createOrGetVMapManager() { if(gVMapManager == 0) - gVMapManager= new VMapManager(); // should be taken from config ... Please change if you like :-) + gVMapManager= new VMapManager2(); // should be taken from config ... Please change if you like :-) return gVMapManager; } @@ -110,4 +134,3 @@ namespace VMAP } } } - |