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

- Port spritetype::insector() over from develop and use with sector nullptr checks in 6539d72663.

Browse source
This commit is contained in:
Mitch Richters 2021-12-07 19:56:50 +11:00
parent 6539d72663
commit 63a19bbb15
5 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/build/include/build.h
View file

@ -742,6 +742,12 @@ inline bool testgotpic(int32_t tilenume, bool reset = false)
}
inline bool spritetype::insector() const
{
return validSectorIndex(sectnum);
}
#include "iterators.h"
#endif // build_h_

1
source/build/include/buildtypes.h
View file

@ -376,6 +376,7 @@ struct spritetype
}
sectortype* sector() const;
bool insector() const;
};
using tspritetype = spritetype;

2
source/games/duke/src/actors.cpp
View file

@ -526,7 +526,7 @@ void moveplayers(void)
}
}
if (spri->sector())
if (spri->insector())
{
if (spri->sector()->ceilingstat & 1)
spri->shade += (spri->sector()->ceilingshade - spri->shade) >> 1;

2
source/games/duke/src/player_d.cpp
View file

@ -2938,7 +2938,7 @@ void processinput_d(int snum)
p->angle.applyinput(sb_avel, &actions);
}
if (p->spritebridge == 0 && s->sector())
if (p->spritebridge == 0 && s->insector())
{
j = s->sector()->floorpicnum;

2
source/games/duke/src/player_r.cpp
View file

@ -3651,7 +3651,7 @@ void processinput_r(int snum)
p->angle.applyinput(sb_avel, &actions);
}
if (p->spritebridge == 0 && s->sector())
if (p->spritebridge == 0 && s->insector())
{
int j = s->sector()->floorpicnum;
k = 0;