Conditionset is UINT16, not UINT8

This commit is contained in:
toaster 2023-06-27 23:03:05 +01:00
parent fe3790b0db
commit 9372f8ff1a
3 changed files with 3 additions and 3 deletions

View file

@ -2859,7 +2859,7 @@ static void readcondition(UINT8 set, UINT32 id, char *word2)
M_AddRawCondition(set, (UINT8)id, ty, re, x1, x2, stringvar);
}
void readconditionset(MYFILE *f, UINT8 setnum)
void readconditionset(MYFILE *f, UINT16 setnum)
{
char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
char *word = s;

View file

@ -62,7 +62,7 @@ skincolornum_t get_skincolor(const char *word);
void readwipes(MYFILE *f);
void readmaincfg(MYFILE *f, boolean mainfile);
void readconditionset(MYFILE *f, UINT8 setnum);
void readconditionset(MYFILE *f, UINT16 setnum);
void readunlockable(MYFILE *f, INT32 num);
void reademblemdata(MYFILE *f, INT32 num);
void readsound(MYFILE *f, INT32 num);

View file

@ -453,7 +453,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
ignorelines(f);
}
else if (i > 0 && i <= MAXCONDITIONSETS)
readconditionset(f, (UINT8)(i-1));
readconditionset(f, (UINT16)(i-1));
else
{
deh_warning("Condition set number %d out of range (1 - %d)", i, MAXCONDITIONSETS);