UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implemented amb286 - .smx extension no longer required with "sm plugins load"

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40800
This commit is contained in:
Scott Ehlert 2007-05-14 21:29:17 +00:00
parent a0486eea8c
commit 515be43896
4 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/systems/LibrarySys.cpp
View File

@ -322,3 +322,23 @@ size_t LibrarySystem::PathFormat(char *buffer, size_t len, const char *fmt, ...)
return mylen; return mylen;
} }
const char *LibrarySystem::GetFileExtension(const char *filename)
{
size_t len = strlen(filename);
for (size_t i = len - 1; i >= 0; i--)
{
if (filename[i] == PLATFORM_SEP_CHAR || filename[i] == PLATFORM_SEP_ALTCHAR)
{
return NULL;
}
if (filename[i] == '.' && i != len - 1)
{
return &filename[++i];
}
}
return NULL;
}

1
core/systems/LibrarySys.h
View File

@ -74,6 +74,7 @@ public:
bool IsPathDirectory(const char *path); bool IsPathDirectory(const char *path);
void GetPlatformError(char *error, size_t maxlength); void GetPlatformError(char *error, size_t maxlength);
size_t PathFormat(char *buffer, size_t len, const char *fmt, ...); size_t PathFormat(char *buffer, size_t len, const char *fmt, ...);
const char *GetFileExtension(const char *filename);
}; };
extern LibrarySystem g_LibSys; extern LibrarySystem g_LibSys;

13
core/systems/PluginSys.cpp
View File

@ -1661,19 +1661,24 @@ void CPluginManager::OnRootConsoleCommand(const char *command, unsigned int argc
char error[128]; char error[128];
bool wasloaded; bool wasloaded;
const char *filename = g_RootMenu.GetArgument(3); const char *filename = g_RootMenu.GetArgument(3);
IPlugin *pl = LoadPlugin(filename, false, PluginType_MapUpdated, error, sizeof(error), &wasloaded);
char pluginfile[256];
const char *ext = g_LibSys.GetFileExtension(filename) ? "" : ".smx";
UTIL_Format(pluginfile, sizeof(pluginfile), "%s%s", filename, ext);
IPlugin *pl = LoadPlugin(pluginfile, false, PluginType_MapUpdated, error, sizeof(error), &wasloaded);
if (wasloaded) if (wasloaded)
{ {
g_RootMenu.ConsolePrint("[SM] Plugin %s is already loaded.", filename); g_RootMenu.ConsolePrint("[SM] Plugin %s is already loaded.", pluginfile);
return; return;
} }
if (pl) if (pl)
{ {
g_RootMenu.ConsolePrint("[SM] Loaded plugin %s successfully.", filename); g_RootMenu.ConsolePrint("[SM] Loaded plugin %s successfully.", pluginfile);
} else { } else {
g_RootMenu.ConsolePrint("[SM] Plugin %s failed to load: %s.", filename, error); g_RootMenu.ConsolePrint("[SM] Plugin %s failed to load: %s.", pluginfile, error);
} }
return; return;

10
public/ILibrarySys.h
View File

@ -29,7 +29,7 @@
namespace SourceMod namespace SourceMod
{ {
#define SMINTERFACE_LIBRARYSYS_NAME "ILibrarySys" #define SMINTERFACE_LIBRARYSYS_NAME "ILibrarySys"
#define SMINTERFACE_LIBRARYSYS_VERSION 1 #define SMINTERFACE_LIBRARYSYS_VERSION 2
class ILibrary class ILibrary
{ {
@ -173,6 +173,14 @@ namespace SourceMod
* @param ... Format string arguments. * @param ... Format string arguments.
*/ */
virtual size_t PathFormat(char *buffer, size_t maxlength, const char *pathfmt, ...) =0; virtual size_t PathFormat(char *buffer, size_t maxlength, const char *pathfmt, ...) =0;
/**
* @brief Returns a pointer to the extension in a filename.
*
* @param filename Name of file from which the extension should be extracted.
* @return Pointer to file extension.
*/
virtual const char *GetFileExtension(const char *filename) =0;
}; };
} }