thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add "then" condition string builder type

Browse source 
Better for some sentences
This commit is contained in:
toaster 2024-04-10 17:24:45 +01:00
parent 9383551cc3
commit 0c782767be
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_netcmd.c
View file

@ -4876,7 +4876,7 @@ static void Command_cxdiag_f(void)
continue; continue;
} }
if (cn->type == UC_AND || cn->type == UC_COMMA) if (cn->type == UC_AND || cn->type == UC_THEN || cn->type == UC_COMMA)
{ {
if (firstpass) if (firstpass)
; ;

1
src/deh_soc.c
View file

@ -2983,6 +2983,7 @@ static void readcondition(UINT16 set, UINT32 id, char *word2)
} }
} }
else if ((offset=0) || fastcmp(params[0], "AND") else if ((offset=0) || fastcmp(params[0], "AND")
|| (++offset && fastcmp(params[0], "THEN"))
|| (++offset && fastcmp(params[0], "COMMA"))) || (++offset && fastcmp(params[0], "COMMA")))
{ {
//PARAMCHECK(1); //PARAMCHECK(1);

5
src/m_cond.c
View file

@ -1638,6 +1638,7 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
// Just for string building // Just for string building
case UC_AND: case UC_AND:
case UC_THEN:
case UC_COMMA: case UC_COMMA:
case UC_DESCRIPTIONOVERRIDE: case UC_DESCRIPTIONOVERRIDE:
return true; return true;
@ -2008,7 +2009,7 @@ static boolean M_CheckConditionSet(conditionset_t *c, player_t *player)
continue; continue;
// Skip entries that are JUST for string building // Skip entries that are JUST for string building
if (cn->type == UC_AND || cn->type == UC_COMMA || cn->type == UC_DESCRIPTIONOVERRIDE) if (cn->type == UC_AND || cn->type == UC_THEN || cn->type == UC_COMMA || cn->type == UC_DESCRIPTIONOVERRIDE)
continue; continue;
lastID = cn->id; lastID = cn->id;
@ -2524,6 +2525,8 @@ static const char *M_GetConditionString(condition_t *cn)
case UC_AND: case UC_AND:
return "&"; return "&";
case UC_THEN:
return "then";
case UC_COMMA: case UC_COMMA:
return ","; return ",";
case UC_DESCRIPTIONOVERRIDE: case UC_DESCRIPTIONOVERRIDE:

1
src/m_cond.h
View file

@ -76,6 +76,7 @@ typedef enum
// Just for string building // Just for string building
UC_AND, UC_AND,
UC_THEN,
UC_COMMA, UC_COMMA,
UC_DESCRIPTIONOVERRIDE, UC_DESCRIPTIONOVERRIDE,