Use SOURCE_ENGINE_ORANGEBOXVALVE constant from MM:S 1.8 (bug 4087, r=dvander).

This commit is contained in:
Scott Ehlert 2009-10-30 14:04:43 -05:00
parent 113ec33743
commit edc6591041
2 changed files with 8 additions and 14 deletions

View File

@ -1,8 +1,8 @@
/** /**
* vim: set ts=4 : * vim: set ts=4 sw=4 tw=99 noet :
* ============================================================================= * =============================================================================
* SourceMod * SourceMod
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. * Copyright (C) 2004-2009 AlliedModders LLC. All rights reserved.
* ============================================================================= * =============================================================================
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under
@ -25,8 +25,6 @@
* this exception to all derivative works. AlliedModders LLC defines further * this exception to all derivative works. AlliedModders LLC defines further
* exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007), * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
* or <http://www.sourcemod.net/license.php>. * or <http://www.sourcemod.net/license.php>.
*
* Version: $Id$
*/ */
#include <ISmmPluginExt.h> #include <ISmmPluginExt.h>
@ -48,8 +46,6 @@
return (c == '/' || c == '\\'); return (c == '/' || c == '\\');
} }
#include <Windows.h> #include <Windows.h>
#define TF_PATH "\\tf\\"
#define DOD_PATH "\\dod\\"
#else #else
#define DLL_EXPORT extern "C" __attribute__((visibility("default"))) #define DLL_EXPORT extern "C" __attribute__((visibility("default")))
#define openlib(lib) dlopen(lib, RTLD_NOW) #define openlib(lib) dlopen(lib, RTLD_NOW)
@ -63,8 +59,6 @@
return (c == '/'); return (c == '/');
} }
#include <dlfcn.h> #include <dlfcn.h>
#define TF_PATH "/tf/"
#define DOD_PATH "/dod/"
#endif #endif
#define METAMOD_API_MAJOR 2 #define METAMOD_API_MAJOR 2
@ -218,12 +212,6 @@ DLL_EXPORT METAMOD_PLUGIN *CreateInterface_MMS(const MetamodVersionInfo *mvi, co
} }
case SOURCE_ENGINE_ORANGEBOX: case SOURCE_ENGINE_ORANGEBOX:
{ {
if (strstr(mli->pl_path, TF_PATH) || strstr(mli->pl_path, DOD_PATH))
{
filename = FILENAME_1_6_EP2VALVE;
break;
}
filename = FILENAME_1_6_EP2; filename = FILENAME_1_6_EP2;
break; break;
} }
@ -237,6 +225,11 @@ DLL_EXPORT METAMOD_PLUGIN *CreateInterface_MMS(const MetamodVersionInfo *mvi, co
filename = FILENAME_1_6_DARKM; filename = FILENAME_1_6_DARKM;
break; break;
} }
case SOURCE_ENGINE_ORANGEBOXVALVE:
{
filename = FILENAME_1_6_EP2VALVE;
break;
}
case SOURCE_ENGINE_LEFT4DEAD2: case SOURCE_ENGINE_LEFT4DEAD2:
{ {
filename = FILENAME_1_6_L4D2; filename = FILENAME_1_6_L4D2;

View File

@ -137,6 +137,7 @@
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
AdditionalIncludeDirectories="..\..\public"
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"