source/metamod-source
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-12-06 18:08:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added error field to provider loading.

Browse Source
This commit is contained in:
David Anderson 2008-11-15 21:10:13 -06:00
parent b86f66d459
commit 0e05b948fd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
loader/loader_bridge.h
View File

@ -15,7 +15,7 @@ struct vsp_bridge_info
class IVspBridge class IVspBridge
{ {
public: public:
virtual bool Load(const vsp_bridge_info *info) = 0; virtual bool Load(const vsp_bridge_info *info, char *buffer, size_t maxlength) = 0;
virtual void Unload() = 0; virtual void Unload() = 0;
virtual const char *GetDescription() = 0; virtual const char *GetDescription() = 0;
}; };

7
loader/serverplugin.cpp
View File

@ -1,4 +1,5 @@
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <assert.h> #include <assert.h>
#include <stddef.h> #include <stddef.h>
#include "loader.h" #include "loader.h"
@ -133,7 +134,7 @@ public:
if (get_bridge == NULL) if (get_bridge == NULL)
{ {
mm_UnloadMetamodLibrary(); mm_UnloadMetamodLibrary();
mm_LogFatal("Detected engine %d but could not find GetVspBridge callback."); mm_LogFatal("Detected engine %d but could not find GetVspBridge callback.", backend);
return false; return false;
} }
@ -146,9 +147,11 @@ public:
info.vsp_callbacks = (IServerPluginCallbacks*)this; info.vsp_callbacks = (IServerPluginCallbacks*)this;
info.vsp_version = vsp_version; info.vsp_version = vsp_version;
if (!bridge->Load(&info)) strcpy(error, "Unknown error");
if (!bridge->Load(&info, error, sizeof(error)))
{ {
mm_UnloadMetamodLibrary(); mm_UnloadMetamodLibrary();
mm_LogFatal("Unknown error loading Metamod for engine %d: %s", backend, error);
return false; return false;
} }