source/metamod-source
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-12-07 10:28:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed double-load bug

Browse Source 
--HG--
extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40181
This commit is contained in:
David Anderson 2006-02-09 06:55:02 +00:00
parent 3ea2f023e1
commit 7078132342
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sourcemm/CPlugin.cpp
View File

@ -63,7 +63,7 @@ PluginId CPluginManager::Load(const char *file, PluginId source, bool &already,
PluginIter i = m_Plugins.begin(); PluginIter i = m_Plugins.begin();
while (i != m_Plugins.end()) while (i != m_Plugins.end())
{ {
if ( (*i) && (*i)->m_File.compare(file)==0 ) if ( (*i) && UTIL_PathCmp(file, (*i)->m_File.c_str()) )
{ {
if ( (*i)->m_Status < Pl_Paused ) if ( (*i)->m_Status < Pl_Paused )
{ {

4
sourcemm/concommands.cpp
View File

@ -376,16 +376,16 @@ CON_COMMAND(meta, "Metamod:Source Menu")
if (file[0] == '/' || strcmp(&(file[1]), ":\\") == 0) if (file[0] == '/' || strcmp(&(file[1]), ":\\") == 0)
{ {
g_SmmAPI.PathFormat(full_path, sizeof(full_path)-1, "%s", file);
snprintf(full_path, sizeof(full_path)-1, "%s", file); snprintf(full_path, sizeof(full_path)-1, "%s", file);
} else { } else {
const char *ext = UTIL_GetExtension(file); const char *ext = UTIL_GetExtension(file);
#if defined WIN32 || defined _WIN32 #if defined WIN32 || defined _WIN32
ext = ext ? "" : ".dll"; ext = ext ? "" : ".dll";
snprintf(full_path, sizeof(full_path)-1, "%s\\%s%s", g_ModPath.c_str(), file, ext);
#else #else
ext = ext ? "" : "_i486.so"; ext = ext ? "" : "_i486.so";
snprintf(full_path, sizeof(full_path)-1, "%s/%s%s", g_ModPath.c_str(), file, ext);
#endif #endif
g_SmmAPI.PathFormat(full_path, sizeof(full_path)-1, "%s/%s%s", g_ModPath.c_str(), file, ext);
} }
char error[255]={0}; char error[255]={0};

8
sourcemm/version.rc
View File

@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,2,0,0 FILEVERSION 1,2,1,0
PRODUCTVERSION 1,2,0,0 PRODUCTVERSION 1,2,1,0
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -45,12 +45,12 @@ BEGIN
BEGIN BEGIN
VALUE "Comments", "Metamod: Source" VALUE "Comments", "Metamod: Source"
VALUE "FileDescription", "Metamod: Source" VALUE "FileDescription", "Metamod: Source"
VALUE "FileVersion", "1.2" VALUE "FileVersion", "1.2.1"
VALUE "InternalName", "sourcemm" VALUE "InternalName", "sourcemm"
VALUE "LegalCopyright", "Copyright (c) 2004-2006, Metamod: Source Development Team" VALUE "LegalCopyright", "Copyright (c) 2004-2006, Metamod: Source Development Team"
VALUE "OriginalFilename", "server.dll" VALUE "OriginalFilename", "server.dll"
VALUE "ProductName", "Metamod: Source" VALUE "ProductName", "Metamod: Source"
VALUE "ProductVersion", "1.2" VALUE "ProductVersion", "1.2.1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"