Last few magic numbers I could find

This commit is contained in:
TehRealSalt 2019-09-23 08:50:59 -04:00
parent 9072f233eb
commit a46036e489
3 changed files with 4 additions and 4 deletions

View file

@ -325,7 +325,7 @@ typedef struct
UINT8 gametype; UINT8 gametype;
UINT8 modifiedgame; UINT8 modifiedgame;
SINT8 adminplayers[MAXPLAYERS]; // Needs to be signed SINT8 adminplayers[MAXPLAYERS]; // Needs to be signed
UINT16 powerlevels[MAXPLAYERS][2]; // SRB2kart: player power levels UINT16 powerlevels[MAXPLAYERS][PWRLV_NUMTYPES]; // SRB2kart: player power levels
char server_context[8]; // Unique context id, generated at server startup. char server_context[8]; // Unique context id, generated at server startup.

View file

@ -2559,9 +2559,9 @@ static void readcondition(UINT8 set, UINT32 id, char *word2)
re = atoi(params[1]); re = atoi(params[1]);
x1 = atoi(params[2]); x1 = atoi(params[2]);
if (x1 < 0 || x1 > 1) if (x1 < 0 || x1 >= PWRLV_NUMTYPES)
{ {
deh_warning("Power level type %d out of range (0 - 1)", x1); deh_warning("Power level type %d out of range (0 - %d)", x1, PWRLV_NUMTYPES-1);
return; return;
} }
} }

View file

@ -6211,7 +6211,7 @@ static char *M_GetConditionString(condition_t cond)
case UC_MATCHESPLAYED: case UC_MATCHESPLAYED:
return va("Play %d matches", cond.requirement); return va("Play %d matches", cond.requirement);
case UC_POWERLEVEL: case UC_POWERLEVEL:
return va("Reach power level %d in %s", cond.requirement, (cond.extrainfo1 == 1 ? "Battle" : "Race")); return va("Reach power level %d in %s", cond.requirement, (cond.extrainfo1 == PWRLV_BATTLE ? "Battle" : "Race"));
case UC_GAMECLEAR: case UC_GAMECLEAR:
if (cond.requirement > 1) if (cond.requirement > 1)
return va("Beat game %d times", cond.requirement); return va("Beat game %d times", cond.requirement);