From 77c51980094546e0e431e8a15b6cb6c9ee0bd116 Mon Sep 17 00:00:00 2001 From: Lukasz Wlasinksi Date: Wed, 10 Nov 2004 00:25:53 +0000 Subject: [PATCH] fixed modules problems when declared also in metamod's plugins.ini --- dlls/csx/source/amxxmodule.cpp | 5 +++++ dlls/dod2/dodfun/amxxmodule.cpp | 5 +++++ dlls/dod2/dodx/amxxmodule.cpp | 5 +++++ dlls/tfc/tfcx/amxxmodule.cpp | 5 +++++ dlls/ts/tsx/amxxmodule.cpp | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/dlls/csx/source/amxxmodule.cpp b/dlls/csx/source/amxxmodule.cpp index 9f4e7ebb..5ade3d43 100755 --- a/dlls/csx/source/amxxmodule.cpp +++ b/dlls/csx/source/amxxmodule.cpp @@ -2296,6 +2296,11 @@ C_DLLEXPORT int Meta_Query(char *ifvers, plugin_info_t **pPlugInfo, mutil_funcs_ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, meta_globals_t *pMGlobals, gamedll_funcs_t *pGamedllFuncs) { + if ( gpGamedllFuncs ){ + LOG_ERROR(PLID,"gpGamedllFuncs already set"); + return(FALSE); + } + if(now > Plugin_info.loadable) { LOG_ERROR(PLID, "Can't load module right now"); return(FALSE); diff --git a/dlls/dod2/dodfun/amxxmodule.cpp b/dlls/dod2/dodfun/amxxmodule.cpp index 9f4e7ebb..5ade3d43 100755 --- a/dlls/dod2/dodfun/amxxmodule.cpp +++ b/dlls/dod2/dodfun/amxxmodule.cpp @@ -2296,6 +2296,11 @@ C_DLLEXPORT int Meta_Query(char *ifvers, plugin_info_t **pPlugInfo, mutil_funcs_ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, meta_globals_t *pMGlobals, gamedll_funcs_t *pGamedllFuncs) { + if ( gpGamedllFuncs ){ + LOG_ERROR(PLID,"gpGamedllFuncs already set"); + return(FALSE); + } + if(now > Plugin_info.loadable) { LOG_ERROR(PLID, "Can't load module right now"); return(FALSE); diff --git a/dlls/dod2/dodx/amxxmodule.cpp b/dlls/dod2/dodx/amxxmodule.cpp index 9f4e7ebb..5ade3d43 100755 --- a/dlls/dod2/dodx/amxxmodule.cpp +++ b/dlls/dod2/dodx/amxxmodule.cpp @@ -2296,6 +2296,11 @@ C_DLLEXPORT int Meta_Query(char *ifvers, plugin_info_t **pPlugInfo, mutil_funcs_ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, meta_globals_t *pMGlobals, gamedll_funcs_t *pGamedllFuncs) { + if ( gpGamedllFuncs ){ + LOG_ERROR(PLID,"gpGamedllFuncs already set"); + return(FALSE); + } + if(now > Plugin_info.loadable) { LOG_ERROR(PLID, "Can't load module right now"); return(FALSE); diff --git a/dlls/tfc/tfcx/amxxmodule.cpp b/dlls/tfc/tfcx/amxxmodule.cpp index 9f4e7ebb..5ade3d43 100755 --- a/dlls/tfc/tfcx/amxxmodule.cpp +++ b/dlls/tfc/tfcx/amxxmodule.cpp @@ -2296,6 +2296,11 @@ C_DLLEXPORT int Meta_Query(char *ifvers, plugin_info_t **pPlugInfo, mutil_funcs_ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, meta_globals_t *pMGlobals, gamedll_funcs_t *pGamedllFuncs) { + if ( gpGamedllFuncs ){ + LOG_ERROR(PLID,"gpGamedllFuncs already set"); + return(FALSE); + } + if(now > Plugin_info.loadable) { LOG_ERROR(PLID, "Can't load module right now"); return(FALSE); diff --git a/dlls/ts/tsx/amxxmodule.cpp b/dlls/ts/tsx/amxxmodule.cpp index 9f4e7ebb..5ade3d43 100755 --- a/dlls/ts/tsx/amxxmodule.cpp +++ b/dlls/ts/tsx/amxxmodule.cpp @@ -2296,6 +2296,11 @@ C_DLLEXPORT int Meta_Query(char *ifvers, plugin_info_t **pPlugInfo, mutil_funcs_ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, meta_globals_t *pMGlobals, gamedll_funcs_t *pGamedllFuncs) { + if ( gpGamedllFuncs ){ + LOG_ERROR(PLID,"gpGamedllFuncs already set"); + return(FALSE); + } + if(now > Plugin_info.loadable) { LOG_ERROR(PLID, "Can't load module right now"); return(FALSE);