From bb49f0e021fb1fbefad44d944233fb1cf72c495c Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Wed, 1 Feb 2012 09:12:54 +0000 Subject: Introducing StringUtils - the place to be if you are a generic string routine :) No more sprintf()! git-svn-id: http://mc-server.googlecode.com/svn/trunk@209 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cPluginManager.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'source/cPluginManager.cpp') diff --git a/source/cPluginManager.cpp b/source/cPluginManager.cpp index f7d8ad7dc..de49d81e9 100644 --- a/source/cPluginManager.cpp +++ b/source/cPluginManager.cpp @@ -5,7 +5,6 @@ #include "cPlugin.h" #include "cPlugin_Lua.h" #include "cPlugin_NewLua.h" -#include "cMCLogger.h" #include "cWebAdmin.h" #include "cItem.h" #include "cRoot.h" @@ -15,17 +14,15 @@ #include "SquirrelBindings.h" #if USE_SQUIRREL -#pragma warning(disable:4100;disable:4127;disable:4510;disable:4610;disable:4244;disable:4512) // Getting A LOT of these warnings from SqPlus -#include -#pragma warning(default:4100;default:4127;default:4510;default:4610;default:4244;default:4512) + #pragma warning(disable:4100;disable:4127;disable:4510;disable:4610;disable:4244;disable:4512) // Getting A LOT of these warnings from SqPlus + #include + #pragma warning(default:4100;default:4127;default:4510;default:4610;default:4244;default:4512) #endif -extern std::vector StringSplit(std::string str, std::string delim); - typedef std::list< cPlugin_Lua* > LuaPluginList; typedef std::map< cPluginManager::PluginHook, cPluginManager::PluginList > HookMap; @@ -96,7 +93,7 @@ void cPluginManager::ReloadPluginsNow() // allow for comma separated plugin list // degrades and works fine for the plugin // per line - std::vector< std::string > split = StringSplit( PluginFile, "," ); + AStringVector split = StringSplit( PluginFile, "," ); for (unsigned int j = 0; j < split.size(); j++) { cPlugin_Lua* Plugin = new cPlugin_Lua( (split[j] + std::string(".lua") ).c_str() ); if( !AddLuaPlugin( Plugin ) ) -- cgit v1.2.3