fixed
amb1244 - client meta not working
1.1 --- a/sourcemm/episode1/msvc8/sourcemm.vcproj Fri Dec 14 04:32:47 2007 +0000
1.2 +++ b/sourcemm/episode1/msvc8/sourcemm.vcproj Fri Dec 14 04:57:52 2007 +0000
1.3 @@ -41,7 +41,7 @@
1.4 <Tool
1.5 Name="VCCLCompilerTool"
1.6 Optimization="0"
1.7 - AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook"
1.8 + AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1"
1.9 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
1.10 MinimalRebuild="true"
1.11 BasicRuntimeChecks="3"
1.12 @@ -63,7 +63,7 @@
1.13 />
1.14 <Tool
1.15 Name="VCLinkerTool"
1.16 - AdditionalDependencies="tier1.lib tier0.lib vstdlib.lib"
1.17 + AdditionalDependencies=""$(HL2SDK)\lib\public\tier1.lib" "$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\vstdlib.lib""
1.18 OutputFile="$(OutDir)/server.dll"
1.19 LinkIncremental="2"
1.20 IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib"
1.21 @@ -127,7 +127,7 @@
1.22 Optimization="3"
1.23 FavorSizeOrSpeed="1"
1.24 OmitFramePointers="true"
1.25 - AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook"
1.26 + AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1"
1.27 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
1.28 StringPooling="true"
1.29 ExceptionHandling="1"
1.30 @@ -150,7 +150,7 @@
1.31 />
1.32 <Tool
1.33 Name="VCLinkerTool"
1.34 - AdditionalDependencies="tier0.lib tier1.lib vstdlib.lib"
1.35 + AdditionalDependencies=""$(HL2SDK)\lib\public\tier1.lib" "$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\vstdlib.lib""
1.36 OutputFile="$(OutDir)/server.dll"
1.37 LinkIncremental="1"
1.38 IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib"
1.39 @@ -335,7 +335,6 @@
1.40 RelativePath="..\..\..\sourcehook\sourcehook_hookmangen.cpp"
1.41 >
1.42 </File>
1.43 -
1.44 </Filter>
1.45 </Files>
1.46 <Globals>
2.1 --- a/sourcemm/episode1/provider_ep1.cpp Fri Dec 14 04:32:47 2007 +0000
2.2 +++ b/sourcemm/episode1/provider_ep1.cpp Fri Dec 14 04:57:52 2007 +0000
2.3 @@ -26,6 +26,7 @@
2.4 * Version: $Id$
2.5 */
2.6
2.7 +#include "../metamod_oslink.h"
2.8 #include <sourcehook.h>
2.9 #include "convar_smm.h"
2.10 #include <eiface.h>
2.11 @@ -80,11 +81,10 @@
2.12 }
2.13 }
2.14
2.15 -void BaseProvider::Notify_DLLInit_Pre(void *gamedll,
2.16 +void BaseProvider::Notify_DLLInit_Pre(
2.17 CreateInterfaceFn engineFactory,
2.18 CreateInterfaceFn serverFactory)
2.19 {
2.20 - server = (IServerGameDLL *)gamedll;
2.21 engine = (IVEngineServer *)((engineFactory)(INTERFACEVERSION_VENGINESERVER, NULL));
2.22 if (!engine)
2.23 {
2.24 @@ -349,6 +349,11 @@
2.25 return &g_VspListener;
2.26 }
2.27
2.28 +bool BaseProvider::IsAlternatelyLoaded(/* =0 */)
2.29 +{
2.30 + return false;
2.31 +}
2.32 +
2.33 class GlobCommand : public IMetamodSourceCommandInfo
2.34 {
2.35 public:
3.1 --- a/sourcemm/episode1/provider_ep1.h Fri Dec 14 04:32:47 2007 +0000
3.2 +++ b/sourcemm/episode1/provider_ep1.h Fri Dec 14 04:57:52 2007 +0000
3.3 @@ -52,7 +52,7 @@
3.4 virtual void DisplayError(const char *fmt, ...);
3.5 virtual void DisplayWarning(const char *fmt, ...);
3.6 virtual int TryServerGameDLL(const char *iface);
3.7 - virtual void Notify_DLLInit_Pre(void *gamedll,
3.8 + virtual void Notify_DLLInit_Pre(
3.9 CreateInterfaceFn engineFactory,
3.10 CreateInterfaceFn serverFactory);
3.11 void Notify_DLLShutdown_Pre();
3.12 @@ -71,6 +71,7 @@
3.13 virtual int FindUserMessage(const char *name, int *size=NULL);
3.14 virtual const char *GetUserMessage(int index, int *size=NULL);
3.15 virtual int DetermineSourceEngine(const char *game);
3.16 + virtual bool IsAlternatelyLoaded(/* =0 */);
3.17 };
3.18
3.19 extern IVEngineServer *engine;
4.1 --- a/sourcemm/episode1/vsp_listener.cpp Fri Dec 14 04:32:47 2007 +0000
4.2 +++ b/sourcemm/episode1/vsp_listener.cpp Fri Dec 14 04:57:52 2007 +0000
4.3 @@ -25,6 +25,7 @@
4.4 * Version: $Id$
4.5 */
4.6
4.7 +#include "../metamod_oslink.h"
4.8 #include "vsp_listener.h"
4.9 #include "svn_version.h"
4.10 #include "metamod.h"
5.1 --- a/sourcemm/episode2/provider_ep2.cpp Fri Dec 14 04:32:47 2007 +0000
5.2 +++ b/sourcemm/episode2/provider_ep2.cpp Fri Dec 14 04:57:52 2007 +0000
5.3 @@ -376,7 +376,7 @@
5.4 public:
5.5 unsigned int GetArgCount()
5.6 {
5.7 - return m_cmd->ArgC();
5.8 + return m_cmd->ArgC() - 1;
5.9 }
5.10
5.11 const char *GetArg(unsigned int num)
5.12 @@ -406,6 +406,8 @@
5.13 {
5.14 Command_ClientMeta(pEdict, &cmd);
5.15 }
5.16 +
5.17 + RETURN_META(MRES_SUPERCEDE);
5.18 }
5.19
5.20 bool vcmp(const void *_addr1, const void *_addr2, size_t len)
6.1 --- a/sourcemm/metamod_console.cpp Fri Dec 14 04:32:47 2007 +0000
6.2 +++ b/sourcemm/metamod_console.cpp Fri Dec 14 04:57:52 2007 +0000
6.3 @@ -78,6 +78,16 @@
6.4 else if (strcmp(command, "version") == 0)
6.5 {
6.6 CONMSG("Metamod:Source version %s\n", SOURCEMM_VERSION);
6.7 +
6.8 + if (g_Metamod.IsLoadedAsGameDLL())
6.9 + {
6.10 + CONMSG("Loaded As: GameDLL (gameinfo.txt)\n");
6.11 + }
6.12 + else
6.13 + {
6.14 + CONMSG("Loaded As: Valve Server Plugin\n");
6.15 + }
6.16 +
6.17 CONMSG("Compiled on: %s\n", SOURCEMM_DATE);
6.18 CONMSG("Plugin interface version: %d:%d\n", METAMOD_PLAPI_VERSION, PLAPI_MIN_VERSION);
6.19 CONMSG("SourceHook version: %d:%d\n", g_SHPtr->GetIfaceVersion(), g_SHPtr->GetImplVersion());