diff -r d0494f70e53d -r 966f819588a2 core-legacy/concommands.cpp --- a/core-legacy/concommands.cpp Sun May 16 23:21:08 2010 -0400 +++ b/core-legacy/concommands.cpp Wed May 19 01:28:55 2010 -0500 @@ -1,5 +1,5 @@ /* ======== SourceMM ======== - * Copyright (C) 2004-2009 Metamod:Source Development Team + * Copyright (C) 2004-2010 Metamod:Source Development Team * No warranties of any kind * * License: zlib/libpng @@ -424,18 +424,7 @@ file = alias; } - if (file[0] == '/' || strcmp(&(file[1]), ":\\") == 0) - { - g_SmmAPI.PathFormat(full_path, sizeof(full_path), "%s", file); - } else { - const char *ext = UTIL_GetExtension(file); -#if defined WIN32 || defined _WIN32 - ext = ext ? "" : ".dll"; -#else - ext = ext ? "" : "_i486.so"; -#endif - g_SmmAPI.PathFormat(full_path, sizeof(full_path), "%s/%s%s", g_ModPath.c_str(), file, ext); - } + g_SmmAPI.GetFullPluginPath(file, full_path, sizeof(full_path)); char error[255]={0}; bool already; @@ -526,19 +515,7 @@ file = alias; } - /* first check if it's a known filename */ - if (file[0] == '/' || strcmp(&(file[1]), ":\\") == 0) - { - g_SmmAPI.PathFormat(full_path, sizeof(full_path), "%s", file); - } else { - const char *ext = UTIL_GetExtension(file); -#if defined WIN32 || defined _WIN32 - ext = ext ? "" : ".dll"; -#else - ext = ext ? "" : "_i486.so"; -#endif - g_SmmAPI.PathFormat(full_path, sizeof(full_path), "%s/%s%s", g_ModPath.c_str(), file, ext); - } + g_SmmAPI.GetFullPluginPath(file, full_path, sizeof(full_path)); SourceHook::List::iterator iter, end; SourceMM::CPluginManager::CPlugin *pl;