Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Added **always** and **forcesubtitle**

Browse source
This commit is contained in:
OM 2023-05-28 20:59:42 +02:00
parent 0b82b5d3e0
commit bea0f126fc
3 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
code/cgame/cg_commands.cpp
View file

@ -5269,6 +5269,7 @@ void ClientGameCommandManager::AliasCache(Event* ev)
char parmbuffer[2048]; // this holds the parameters to be passed into the
// alias command
const char* psMapsBuffer;
bool bAlwaysLoaded = false;
if (ev->NumArgs() < 2) {
return;
@ -5282,16 +5283,20 @@ void ClientGameCommandManager::AliasCache(Event* ev)
psMapsBuffer = NULL;
for (i = 3; i <= ev->NumArgs(); i++) {
if (strcmp(ev->GetToken(i).c_str(), "maps")) {
strcat(parmbuffer, ev->GetToken(i));
strcat(parmbuffer, " ");
}
else {
if (!strcmp(ev->GetToken(i).c_str(), "maps")) {
psMapsBuffer = ev->GetToken(i++);
}
else if (!strcmp(ev->GetToken(i).c_str(), "always")) {
bAlwaysLoaded = true;
}
else
{
strcat(parmbuffer, ev->GetToken(i));
strcat(parmbuffer, " ");
}
}
if (bLoadForMap(psMapsBuffer, ev->GetString(1)))
if (bAlwaysLoaded || bLoadForMap(psMapsBuffer, ev->GetString(1)))
{
AliasResource(current_tiki, ev->GetString(1), ev->GetString(2), parmbuffer);
CacheResource(ev->GetString(2));
@ -5309,6 +5314,7 @@ void ClientGameCommandManager::Alias(Event* ev)
// alias command
qboolean subtitle;
const char* psMapsBuffer;
bool bAlwaysLoaded = false;
if (ev->NumArgs() < 2) {
return;
@ -5324,11 +5330,19 @@ void ClientGameCommandManager::Alias(Event* ev)
for (i = 3; i <= ev->NumArgs(); i++)
{
if (strcmp(ev->GetToken(i).c_str(), "maps"))
if (!strcmp(ev->GetToken(i).c_str(), "maps"))
{
psMapsBuffer = ev->GetToken(i++);
}
else if (!strcmp(ev->GetToken(i).c_str(), "always"))
{
bAlwaysLoaded = true;
}
else
{
if (!subtitle)
{
if (!Q_stricmp(ev->GetToken(i), "subtitle")) {
if (!Q_stricmp(ev->GetToken(i), "subtitle") || !Q_stricmp(ev->GetToken(i), "forcesubtitle")) {
subtitle = qtrue;
strcat(parmbuffer, ev->GetToken(i));
}
@ -5346,12 +5360,9 @@ void ClientGameCommandManager::Alias(Event* ev)
strcat(parmbuffer, " ");
}
else {
psMapsBuffer = ev->GetToken(i++);
}
}
if (bLoadForMap(psMapsBuffer, ev->GetString(1)))
if (bAlwaysLoaded || bLoadForMap(psMapsBuffer, ev->GetString(1)))
{
AliasResource(current_tiki, ev->GetString(1), ev->GetString(2), parmbuffer);
}

8
code/qcommon/alias.c
View file

@ -255,8 +255,14 @@ void Alias_ListAddParms(AliasListNode_t* node, const char* parameters)
continue;
}
}
else if (!Q_stricmp(token, "subtitle"))
else if (!Q_stricmp(token, "subtitle") || !Q_stricmp(token, "forcesubtitle"))
{
if (!Q_stricmp(token, "subtitle")) {
node->forcesubtitle = qfalse;
} else {
node->forcesubtitle = qtrue;
}
token = COM_GetToken((char**)&parameters, qtrue);
if (!token || !*token)
{

1
code/qcommon/alias.h
View file

@ -56,6 +56,7 @@ typedef struct AliasListNode_s {
float maxDist;
int channel;
int streamed;
qboolean forcesubtitle;
char* subtitle;
} AliasListNode_t;