UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Loads succesfully on tf now, Initial offset testing looks good (bug 3948, what else)

Browse Source
This commit is contained in:
Matt Woodrow 2009-08-14 20:14:03 +12:00
parent 65d34bdb55
commit 58cb84d0bf
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ExtensionSys.cpp
View File

@ -74,7 +74,7 @@ CLocalExtension::CLocalExtension(const char *filename)
#elif SOURCE_ENGINE == SE_ORANGEBOX #elif SOURCE_ENGINE == SE_ORANGEBOX
"extensions/auto.2.ep2/%s", "extensions/auto.2.ep2/%s",
#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE #elif SOURCE_ENGINE == SE_ORANGEBOXVALVE
"extensions/auto.2.ep2valve", "extensions/auto.2.ep2valve/%s",
#elif SOURCE_ENGINE == SE_DARKMESSIAH #elif SOURCE_ENGINE == SE_DARKMESSIAH
"extensions/auto.2.darkm/%s", "extensions/auto.2.darkm/%s",
#else #else

2
extensions/bintools/CallWrapper.cpp
View File

@ -180,7 +180,7 @@ const SourceHook::PassInfo * CallWrapper::GetSHParamInfo(unsigned int num)
unsigned int CallWrapper::GetParamOffset(unsigned int num) unsigned int CallWrapper::GetParamOffset(unsigned int num)
{ {
assert(num <= GetParamCount() && num > 0); assert(num < GetParamCount() && num >= 0);
return m_Params[num].offset; return m_Params[num].offset;
} }

8
extensions/bintools/msvc9/bintools.vcproj
View File

@ -991,6 +991,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{C06F7BFF-18EE-4994-8572-D6383011354B}" UniqueIdentifier="{C06F7BFF-18EE-4994-8572-D6383011354B}"
> >
<File
RelativePath="..\..\..\public\extensions\IBinTools.h"
>
</File>
<File <File
RelativePath="..\version.rc" RelativePath="..\version.rc"
> >
@ -1070,10 +1074,6 @@
Name="Interfaces" Name="Interfaces"
UniqueIdentifier="{7DE81EA3-99D9-4f34-823A-B314791F3514}" UniqueIdentifier="{7DE81EA3-99D9-4f34-823A-B314791F3514}"
> >
<File
RelativePath="..\..\..\public\extensions\IBinTools.h"
>
</File>
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>

2
gamedata/sdktools.games/master.games.txt
View File

@ -17,7 +17,7 @@
/* Special OB engine for TF/DoD:S only */ /* Special OB engine for TF/DoD:S only */
"engine.ep2valve.txt" "engine.ep2valve.txt"
{ {
engine" "orangebox_valve" "engine" "orangebox_valve"
} }
"engine.ep1.txt" "engine.ep1.txt"

6
loader/loader.cpp
View File

@ -48,6 +48,8 @@
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)
@ -61,6 +63,8 @@
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
@ -213,7 +217,7 @@ DLL_EXPORT METAMOD_PLUGIN *CreateInterface_MMS(const MetamodVersionInfo *mvi, co
} }
case SOURCE_ENGINE_ORANGEBOX: case SOURCE_ENGINE_ORANGEBOX:
{ {
if (strncmp(mli->pl_path, "tf/", 3) == 0 || strncmp(mli->pl_path, "dod/", 4) == 0) if (strstr(mli->pl_path, TF_PATH) || strstr(mli->pl_path, DOD_PATH))
{ {
filename = FILENAME_1_6_EP2VALVE; filename = FILENAME_1_6_EP2VALVE;
break; break;