mirror of
https://github.com/alliedmodders/metamod-source.git
synced 2025-02-20 13:54:14 +01:00
fixed amb1244 - client meta not working
--HG-- extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40596
This commit is contained in:
parent
a9c61692e8
commit
09a87049ab
@ -41,7 +41,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook"
|
||||
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -63,7 +63,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="tier1.lib tier0.lib vstdlib.lib"
|
||||
AdditionalDependencies=""$(HL2SDK)\lib\public\tier1.lib" "$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\vstdlib.lib""
|
||||
OutputFile="$(OutDir)/server.dll"
|
||||
LinkIncremental="2"
|
||||
IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib"
|
||||
@ -127,7 +127,7 @@
|
||||
Optimization="3"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook"
|
||||
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
@ -150,7 +150,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="tier0.lib tier1.lib vstdlib.lib"
|
||||
AdditionalDependencies=""$(HL2SDK)\lib\public\tier1.lib" "$(HL2SDK)\lib\public\tier0.lib" "$(HL2SDK)\lib\public\vstdlib.lib""
|
||||
OutputFile="$(OutDir)/server.dll"
|
||||
LinkIncremental="1"
|
||||
IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib"
|
||||
@ -335,7 +335,6 @@
|
||||
RelativePath="..\..\..\sourcehook\sourcehook_hookmangen.cpp"
|
||||
>
|
||||
</File>
|
||||
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
|
@ -26,6 +26,7 @@
|
||||
* Version: $Id$
|
||||
*/
|
||||
|
||||
#include "../metamod_oslink.h"
|
||||
#include <sourcehook.h>
|
||||
#include "convar_smm.h"
|
||||
#include <eiface.h>
|
||||
@ -80,11 +81,10 @@ void BaseProvider::ConsolePrint(const char *str)
|
||||
}
|
||||
}
|
||||
|
||||
void BaseProvider::Notify_DLLInit_Pre(void *gamedll,
|
||||
void BaseProvider::Notify_DLLInit_Pre(
|
||||
CreateInterfaceFn engineFactory,
|
||||
CreateInterfaceFn serverFactory)
|
||||
{
|
||||
server = (IServerGameDLL *)gamedll;
|
||||
engine = (IVEngineServer *)((engineFactory)(INTERFACEVERSION_VENGINESERVER, NULL));
|
||||
if (!engine)
|
||||
{
|
||||
@ -349,6 +349,11 @@ IServerPluginCallbacks *BaseProvider::GetVSPCallbacks(const char *iface)
|
||||
return &g_VspListener;
|
||||
}
|
||||
|
||||
bool BaseProvider::IsAlternatelyLoaded(/* =0 */)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
class GlobCommand : public IMetamodSourceCommandInfo
|
||||
{
|
||||
public:
|
||||
|
@ -52,7 +52,7 @@ public:
|
||||
virtual void DisplayError(const char *fmt, ...);
|
||||
virtual void DisplayWarning(const char *fmt, ...);
|
||||
virtual int TryServerGameDLL(const char *iface);
|
||||
virtual void Notify_DLLInit_Pre(void *gamedll,
|
||||
virtual void Notify_DLLInit_Pre(
|
||||
CreateInterfaceFn engineFactory,
|
||||
CreateInterfaceFn serverFactory);
|
||||
void Notify_DLLShutdown_Pre();
|
||||
@ -71,6 +71,7 @@ public:
|
||||
virtual int FindUserMessage(const char *name, int *size=NULL);
|
||||
virtual const char *GetUserMessage(int index, int *size=NULL);
|
||||
virtual int DetermineSourceEngine(const char *game);
|
||||
virtual bool IsAlternatelyLoaded(/* =0 */);
|
||||
};
|
||||
|
||||
extern IVEngineServer *engine;
|
||||
|
@ -25,6 +25,7 @@
|
||||
* Version: $Id$
|
||||
*/
|
||||
|
||||
#include "../metamod_oslink.h"
|
||||
#include "vsp_listener.h"
|
||||
#include "svn_version.h"
|
||||
#include "metamod.h"
|
||||
|
@ -376,7 +376,7 @@ public:
|
||||
public:
|
||||
unsigned int GetArgCount()
|
||||
{
|
||||
return m_cmd->ArgC();
|
||||
return m_cmd->ArgC() - 1;
|
||||
}
|
||||
|
||||
const char *GetArg(unsigned int num)
|
||||
@ -406,6 +406,8 @@ void ClientCommand(edict_t *pEdict, const CCommand &_cmd)
|
||||
{
|
||||
Command_ClientMeta(pEdict, &cmd);
|
||||
}
|
||||
|
||||
RETURN_META(MRES_SUPERCEDE);
|
||||
}
|
||||
|
||||
bool vcmp(const void *_addr1, const void *_addr2, size_t len)
|
||||
|
@ -78,6 +78,16 @@ bool Command_Meta(IMetamodSourceCommandInfo *info)
|
||||
else if (strcmp(command, "version") == 0)
|
||||
{
|
||||
CONMSG("Metamod:Source version %s\n", SOURCEMM_VERSION);
|
||||
|
||||
if (g_Metamod.IsLoadedAsGameDLL())
|
||||
{
|
||||
CONMSG("Loaded As: GameDLL (gameinfo.txt)\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
CONMSG("Loaded As: Valve Server Plugin\n");
|
||||
}
|
||||
|
||||
CONMSG("Compiled on: %s\n", SOURCEMM_DATE);
|
||||
CONMSG("Plugin interface version: %d:%d\n", METAMOD_PLAPI_VERSION, PLAPI_MIN_VERSION);
|
||||
CONMSG("SourceHook version: %d:%d\n", g_SHPtr->GetIfaceVersion(), g_SHPtr->GetImplVersion());
|
||||
|
Loading…
x
Reference in New Issue
Block a user