teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-01 05:30:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- corrected sector check output in validateSprite.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-24 18:13:16 +02:00
parent 2e4996e8fc
commit e4ca397898
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/core/maploader.cpp
View file

@ -261,6 +261,8 @@ static void SetWallPalV5()
void validateSprite(spritetype& spri, int sectnum, int index)
{
sectortype* sectp = &sector[sectnum];
auto pos = spri.pos;
bool bugged = false;
if ((unsigned)spri.statnum >= MAXSTATUS)
@ -275,11 +277,11 @@ void validateSprite(spritetype& spri, int sectnum, int index)
}
else if (!validSectorIndex(sectnum))
{
sectnum = -1;
updatesector(pos, &sectnum);
bugged = sectnum < 0;
sectp = nullptr;
updatesector(pos.XY(), &sectp);
bugged = sectp == nullptr;
if (!DPrintf(DMSG_WARNING, "Sprite #%d (%.0f,%.0f) with invalid sector %d was corrected to sector %d\n", index, pos.X, pos.Y, sectnum, sectnum))
if (!DPrintf(DMSG_WARNING, "Sprite #%d (%.0f,%.0f) with invalid sector %d was corrected to sector %d\n", index, pos.X, pos.Y, sectnum, ::sectnum(sectp)))
{
if (bugged) Printf("Sprite #%d (%.0f,%.0f) with invalid sector %d\n", index, pos.X, pos.Y, sectnum);
}
@ -288,10 +290,9 @@ void validateSprite(spritetype& spri, int sectnum, int index)
{
spri = {};
spri.statnum = MAXSTATUS;
sectnum = -1;
sectp = nullptr;
}
if (sectnum >= 0) spri.sectp = &sector[sectnum];
else spri.sectp = nullptr;
spri.sectp = sectp;
}
static void ReadSpriteV7(FileReader& fr, spritetype& spr, int& secno)