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

Get sdktools and sdkhooks/dhooks to load on hl2sdk-mock (#1892)

Browse Source 
* Build SDKTools for hl2sdk-mock

* Fix loading of extensions using advanced naming scheme for hl2sdk-mock

* Fix error on missing sv_visiblemaxplayers convar

* Build SDKHooks for hl2sdk-mock

* Fix x86_64 SourcePawn VM filename

* SDKHooks: Ignore missing IEntityListeners list in hl2sdk-mock
This commit is contained in:
peace-maker 2022-12-22 18:39:12 +01:00 committed by GitHub
parent 174bf307a2
commit 4320d7b17a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/logic_bridge.cpp
View File

@ -375,6 +375,8 @@ void UTIL_ConsolePrint(const char *fmt, ...)
#define GAMEFIX "2.pvkii" #define GAMEFIX "2.pvkii"
#elif SOURCE_ENGINE == SE_MCV #elif SOURCE_ENGINE == SE_MCV
#define GAMEFIX "2.mcv" #define GAMEFIX "2.mcv"
#elif SOURCE_ENGINE == SE_MOCK
#define GAMEFIX "2.mock"
#else #else
#define GAMEFIX "2.ep1" #define GAMEFIX "2.ep1"
#endif #endif

2
extensions/sdkhooks/AMBuilder
View File

@ -12,8 +12,6 @@ project.sources += [
for sdk_name in SM.sdks: for sdk_name in SM.sdks:
sdk = SM.sdks[sdk_name] sdk = SM.sdks[sdk_name]
if sdk.name == 'mock':
continue
for cxx in builder.targets: for cxx in builder.targets:
if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]: if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:

12
extensions/sdkhooks/extension.cpp
View File

@ -230,10 +230,15 @@ bool SDKHooks::SDK_OnLoad(char *error, size_t maxlength, bool late)
if (!entListeners) if (!entListeners)
{ {
g_pSM->Format(error, maxlength, "Failed to setup entity listeners"); g_pSM->Format(error, maxlength, "Failed to setup entity listeners");
#if SOURCE_ENGINE != SE_MOCK
return false; return false;
#endif
}
else
{
entListeners->AddToTail(this);
} }
entListeners->AddToTail(this);
sharesys->AddDependency(myself, "bintools.ext", true, true); sharesys->AddDependency(myself, "bintools.ext", true, true);
sharesys->AddNatives(myself, g_Natives); sharesys->AddNatives(myself, g_Natives);
@ -367,7 +372,10 @@ void SDKHooks::SDK_OnUnload()
sharesys->DropCapabilityProvider(myself, this, "SDKHook_LogicalEntSupport"); sharesys->DropCapabilityProvider(myself, this, "SDKHook_LogicalEntSupport");
CUtlVector<IEntityListener *> *entListeners = EntListeners(); CUtlVector<IEntityListener *> *entListeners = EntListeners();
entListeners->FindAndRemove(this); if (entListeners)
{
entListeners->FindAndRemove(this);
}
gameconfs->CloseGameConfigFile(g_pGameConf); gameconfs->CloseGameConfigFile(g_pGameConf);
} }

2
extensions/sdktools/AMBuilder
View File

@ -41,8 +41,6 @@ for sdk_name in SM.sdks:
for cxx in builder.targets: for cxx in builder.targets:
if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]: if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]:
continue continue
if sdk_name == 'mock':
continue
binary = SM.HL2ExtConfig(project, builder, cxx, 'sdktools.ext.' + sdk.ext, sdk) binary = SM.HL2ExtConfig(project, builder, cxx, 'sdktools.ext.' + sdk.ext, sdk)
binary.compiler.cxxincludes += [ binary.compiler.cxxincludes += [

4
plugins/reservedslots.sp
View File

@ -66,7 +66,8 @@ enum KickType
public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max) public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max)
{ {
if (GetEngineVersion() == Engine_Contagion) sv_visiblemaxplayers = FindConVar("sv_visiblemaxplayers");
if (sv_visiblemaxplayers == null)
{ {
// sv_visiblemaxplayers doesn't exist // sv_visiblemaxplayers doesn't exist
strcopy(error, err_max, "Reserved Slots is incompatible with this game"); strcopy(error, err_max, "Reserved Slots is incompatible with this game");
@ -82,7 +83,6 @@ public void OnPluginStart()
sm_reserved_slots = CreateConVar("sm_reserved_slots", "0", "Number of reserved player slots", 0, true, 0.0); sm_reserved_slots = CreateConVar("sm_reserved_slots", "0", "Number of reserved player slots", 0, true, 0.0);
sm_hide_slots = CreateConVar("sm_hide_slots", "0", "If set to 1, reserved slots will hidden (subtracted from the max slot count)", 0, true, 0.0, true, 1.0); sm_hide_slots = CreateConVar("sm_hide_slots", "0", "If set to 1, reserved slots will hidden (subtracted from the max slot count)", 0, true, 0.0, true, 1.0);
sv_visiblemaxplayers = FindConVar("sv_visiblemaxplayers");
sm_reserve_type = CreateConVar("sm_reserve_type", "0", "Method of reserving slots", 0, true, 0.0, true, 2.0); sm_reserve_type = CreateConVar("sm_reserve_type", "0", "Method of reserving slots", 0, true, 0.0, true, 2.0);
sm_reserve_maxadmins = CreateConVar("sm_reserve_maxadmins", "1", "Maximum amount of admins to let in the server with reserve type 2", 0, true, 0.0); sm_reserve_maxadmins = CreateConVar("sm_reserve_maxadmins", "1", "Maximum amount of admins to let in the server with reserve type 2", 0, true, 0.0);
sm_reserve_kicktype = CreateConVar("sm_reserve_kicktype", "0", "How to select a client to kick (if appropriate)", 0, true, 0.0, true, 2.0); sm_reserve_kicktype = CreateConVar("sm_reserve_kicktype", "0", "How to select a client to kick (if appropriate)", 0, true, 0.0, true, 2.0);

4
tools/buildbot/PackageScript
View File

@ -67,7 +67,9 @@ for cxx_task in SM.spvm:
'sourcepawn.jit.x86' + os.path.splitext(cxx_task.binary.path)[1]) 'sourcepawn.jit.x86' + os.path.splitext(cxx_task.binary.path)[1])
builder.AddCopy(cxx_task.binary, dest_path) builder.AddCopy(cxx_task.binary, dest_path)
elif cxx_task.target.arch == 'x86_64': elif cxx_task.target.arch == 'x86_64':
builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/bin/x64']) dest_path = os.path.join('addons/sourcemod/bin/x64',
'sourcepawn.vm' + os.path.splitext(cxx_task.binary.path)[1])
builder.AddCopy(cxx_task.binary, dest_path)
helpers.CopySpcomp('addons/sourcemod/scripting') helpers.CopySpcomp('addons/sourcemod/scripting')