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

spritetype::setsector

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-21 09:15:21 +01:00
parent c2613d9720
commit 38d64fc437
5 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -717,6 +717,12 @@ inline sectortype* spritetype::sector() const
return !validSectorIndex(sectnum)? nullptr : &::sector[sectnum]; return !validSectorIndex(sectnum)? nullptr : &::sector[sectnum];
} }
inline void spritetype::setsector(sectortype* sect)
{
// place for asserts.
sectnum = sect? ::sector.IndexOf(sect) : -1;
}
inline bool spritetype::insector() const inline bool spritetype::insector() const
{ {
return validSectorIndex(sectnum); return validSectorIndex(sectnum);

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

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

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

@ -1504,12 +1504,12 @@ bool queball(DDukeActor *actor, int pocket, int queball, int stripeball)
} }
Collision coll; Collision coll;
int sect = s->sectnum; auto sect = s->sector();
int j = clipmove_ex(&s->pos, &sect, int j = clipmove_ex(&s->pos, &sect,
(MulScale(s->xvel, bcos(s->ang), 14) * TICSPERFRAME) << 11, (MulScale(s->xvel, bcos(s->ang), 14) * TICSPERFRAME) << 11,
(MulScale(s->xvel, bsin(s->ang), 14) * TICSPERFRAME) << 11, (MulScale(s->xvel, bsin(s->ang), 14) * TICSPERFRAME) << 11,
24L, (4 << 8), (4 << 8), CLIPMASK1, coll); 24L, (4 << 8), (4 << 8), CLIPMASK1, coll);
s->sectnum = sect; s->setsector(sect);
if (j == kHitWall) if (j == kHitWall)
{ {

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

@ -204,7 +204,7 @@ static void shootflamethrowerflame(DDukeActor* actor, int p, int sx, int sy, int
spawned->s->x = sx + bsin(sa + 630) / 448; spawned->s->x = sx + bsin(sa + 630) / 448;
spawned->s->y = sy + bsin(sa + 112) / 448; spawned->s->y = sy + bsin(sa + 112) / 448;
spawned->s->z = sz - 256; spawned->s->z = sz - 256;
spawned->s->sectnum = s->sectnum; spawned->s->setsector(s->sector());
spawned->s->cstat = 0x80; spawned->s->cstat = 0x80;
spawned->s->ang = sa; spawned->s->ang = sa;
spawned->s->xrepeat = 2; spawned->s->xrepeat = 2;
@ -1101,7 +1101,7 @@ void shoot_d(DDukeActor* actor, int atwith)
auto k = spawn(actor, atwith); auto k = spawn(actor, atwith);
if (k) if (k)
{ {
k->s->sectnum = sectnum(sect); k->s->setsector(sect);
k->s->x = sx; k->s->x = sx;
k->s->y = sy; k->s->y = sy;
k->s->z = sz; k->s->z = sz;

1
source/games/duke/src/premap_d.cpp
View file

@ -391,7 +391,6 @@ void prelevel_d(int g)
I_Error("Too many mirrors (64 max.)"); I_Error("Too many mirrors (64 max.)");
if (sectp && sectp->ceilingpicnum != MIRROR) if (sectp && sectp->ceilingpicnum != MIRROR)
{ {
assert(wallnum(&wal) > 0);
sectp->ceilingpicnum = MIRROR; sectp->ceilingpicnum = MIRROR;
sectp->floorpicnum = MIRROR; sectp->floorpicnum = MIRROR;
mirrorwall[mirrorcnt] = &wal; mirrorwall[mirrorcnt] = &wal;