Follower lists: Fix typing

Should consistently be signed INT16, not unsigned UINT16
This commit is contained in:
toaster 2023-04-21 20:52:13 +01:00
parent 98288fd289
commit 2f8b8cf532
4 changed files with 5 additions and 5 deletions

View file

@ -1079,7 +1079,7 @@ void readlevelheader(MYFILE *f, char * name)
if (mapheaderinfo[num]->numFollowers) if (mapheaderinfo[num]->numFollowers)
{ {
size_t newsize = sizeof(UINT16) * mapheaderinfo[num]->numFollowers; size_t newsize = sizeof(INT16) * mapheaderinfo[num]->numFollowers;
mapheaderinfo[num]->followers = Z_Realloc(mapheaderinfo[num]->followers, newsize, PU_STATIC, NULL); mapheaderinfo[num]->followers = Z_Realloc(mapheaderinfo[num]->followers, newsize, PU_STATIC, NULL);
// now we add them to the list! // now we add them to the list!
M_Memcpy(mapheaderinfo[num]->followers, tmpfollowers, newsize); M_Memcpy(mapheaderinfo[num]->followers, tmpfollowers, newsize);

View file

@ -461,7 +461,7 @@ struct mapheader_t
// Audience information // Audience information
UINT8 numFollowers; ///< Internal. For audience support. UINT8 numFollowers; ///< Internal. For audience support.
UINT16 *followers; ///< List of audience followers in this level. Allocated dynamically for space reasons. Be careful. INT16 *followers; ///< List of audience followers in this level. Allocated dynamically for space reasons. Be careful.
// Script information // Script information
char runsoc[33]; ///< SOC to execute at start of level (32 character limit instead of 63) char runsoc[33]; ///< SOC to execute at start of level (32 character limit instead of 63)

View file

@ -29,8 +29,8 @@ Obj_AudienceInit
mapthing_t *mthing, mapthing_t *mthing,
INT32 followerpick) INT32 followerpick)
{ {
UINT16 *reflist = NULL; INT16 *reflist = NULL;
UINT16 tempreflist[MAXHEADERFOLLOWERS]; INT16 tempreflist[MAXHEADERFOLLOWERS];
UINT8 numref = 0; UINT8 numref = 0;
audience_mainstate(mobj) = S_NULL; audience_mainstate(mobj) = S_NULL;

View file

@ -374,7 +374,7 @@ void P_SetDefaultHeaderFollowers(UINT16 i)
I_Assert(validdefaultfollowers != 0); I_Assert(validdefaultfollowers != 0);
} }
mapheaderinfo[i]->followers = Z_Realloc(mapheaderinfo[i]->followers, sizeof(UINT16) * validdefaultfollowers, PU_STATIC, NULL); mapheaderinfo[i]->followers = Z_Realloc(mapheaderinfo[i]->followers, sizeof(INT16) * validdefaultfollowers, PU_STATIC, NULL);
for (mapheaderinfo[i]->numFollowers = 0; mapheaderinfo[i]->numFollowers < validdefaultfollowers; mapheaderinfo[i]->numFollowers++) for (mapheaderinfo[i]->numFollowers = 0; mapheaderinfo[i]->numFollowers < validdefaultfollowers; mapheaderinfo[i]->numFollowers++)
{ {