rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-02-21 14:54:14 +01:00
Code Issues Releases Activity

Changes required for upcoming Blade Symphony update

Browse Source
This commit is contained in:
Asher Baker 2020-03-10 23:54:57 +00:00
parent 98d0c0ff7e
commit 1b449d20b8
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AMBuildScript
View File

@ -56,7 +56,7 @@ PossibleSDKs = {
'csgo': SDK('HL2SDKCSGO', '2.csgo', '21', 'CSGO', CSGO, 'csgo'), 'csgo': SDK('HL2SDKCSGO', '2.csgo', '21', 'CSGO', CSGO, 'csgo'),
'dota': SDK('HL2SDKDOTA', '2.dota', '22', 'DOTA', [], 'dota'), 'dota': SDK('HL2SDKDOTA', '2.dota', '22', 'DOTA', [], 'dota'),
'portal2': SDK('HL2SDKPORTAL2', '2.portal2', '17', 'PORTAL2', [], 'portal2'), 'portal2': SDK('HL2SDKPORTAL2', '2.portal2', '17', 'PORTAL2', [], 'portal2'),
'blade': SDK('HL2SDKBLADE', '2.blade', '18', 'BLADE', WinLinux, 'blade'), 'blade': SDK('HL2SDKBLADE', '2.blade', '18', 'BLADE', WinOnly, 'blade'),
'insurgency': SDK('HL2SDKINSURGENCY', '2.insurgency', '19', 'INSURGENCY', WinLinuxMac, 'insurgency'), 'insurgency': SDK('HL2SDKINSURGENCY', '2.insurgency', '19', 'INSURGENCY', WinLinuxMac, 'insurgency'),
'doi': SDK('HL2SDKDOI', '2.doi', '20', 'DOI', WinLinuxMac, 'doi'), 'doi': SDK('HL2SDKDOI', '2.doi', '20', 'DOI', WinLinuxMac, 'doi'),
'contagion': SDK('HL2SDKCONTAGION', '2.contagion', '14', 'CONTAGION', WinOnly, 'contagion'), 'contagion': SDK('HL2SDKCONTAGION', '2.contagion', '14', 'CONTAGION', WinOnly, 'contagion'),
@ -356,7 +356,7 @@ class MMSConfig(object):
if builder.target.platform in ['linux', 'mac']: if builder.target.platform in ['linux', 'mac']:
compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE'] compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
if sdk.name == 'csgo' and builder.target.platform == 'linux': if sdk.name in ['csgo', 'blade'] and builder.target.platform == 'linux':
compiler.linkflags += ['-lstdc++'] compiler.linkflags += ['-lstdc++']
@ -466,7 +466,7 @@ class MMSConfig(object):
compiler.linkflags[0:0] = ['-lm'] compiler.linkflags[0:0] = ['-lm']
if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2', 'insurgency', 'doi']: if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2', 'insurgency', 'doi']:
dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so'] dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
elif arch == 'x64' and sdk.name == 'csgo': elif arch == 'x64' and sdk.name in ['csgo', 'blade']:
dynamic_libs = ['libtier0_client.so', 'libvstdlib_client.so'] dynamic_libs = ['libtier0_client.so', 'libvstdlib_client.so']
elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo', 'dota']: elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo', 'dota']:
dynamic_libs = ['libtier0.so', 'libvstdlib.so'] dynamic_libs = ['libtier0.so', 'libvstdlib.so']

4
core/provider/provider_ep2.cpp
View File

@ -441,7 +441,7 @@ void BaseProvider::UnregisterConCommandBase(ConCommandBase *pCommand)
int BaseProvider::GetUserMessageCount() int BaseProvider::GetUserMessageCount()
{ {
#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA #if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA || SOURCE_ENGINE == SE_BLADE
return -1; return -1;
#else #else
return (int)usermsgs_list.size(); return (int)usermsgs_list.size();
@ -757,7 +757,7 @@ void ClientCommand(edict_t *client)
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA #if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA || SOURCE_ENGINE == SE_BLADE
void CacheUserMessages() void CacheUserMessages()
{ {

7
loader/loader.cpp
View File

@ -323,6 +323,11 @@ mm_DetermineBackend(QueryValveInterface engineFactory, QueryValveInterface serve
{ {
return MMBackend_BMS; return MMBackend_BMS;
} }
if (mm_FindPattern(engineFactory, " Blade Symphony ", sizeof(" Blade Symphony ") - 1))
{
return MMBackend_Blade;
}
return MMBackend_CSGO; return MMBackend_CSGO;
} }
@ -344,7 +349,7 @@ mm_DetermineBackend(QueryValveInterface engineFactory, QueryValveInterface serve
return MMBackend_Portal2; return MMBackend_Portal2;
} }
return MMBackend_Blade; return MMBackend_Blade; // Old Blade
} }
else if (engineFactory("VPrecacheSystem001", NULL) != NULL) else if (engineFactory("VPrecacheSystem001", NULL) != NULL)
{ {