From 9372f8ff1a5dcfbe18cf78f35f006d5567525626 Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 27 Jun 2023 23:03:05 +0100 Subject: [PATCH] Conditionset is UINT16, not UINT8 --- src/deh_soc.c | 2 +- src/deh_soc.h | 2 +- src/dehacked.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/deh_soc.c b/src/deh_soc.c index eb30c33ed..c9c457383 100644 --- a/src/deh_soc.c +++ b/src/deh_soc.c @@ -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; diff --git a/src/deh_soc.h b/src/deh_soc.h index cd20b7714..e1d5e9a32 100644 --- a/src/deh_soc.h +++ b/src/deh_soc.h @@ -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); diff --git a/src/dehacked.c b/src/dehacked.c index b46805a97..f6ac70fe1 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -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);