- the final wall iterators.

This commit is contained in:
Christoph Oelckers 2021-11-24 22:08:41 +01:00
parent bb315f8148
commit 4acca06c71
2 changed files with 4 additions and 6 deletions

View file

@ -233,7 +233,7 @@ FAFhitscan(int32_t x, int32_t y, int32_t z, int16_t sectnum,
{
if (TEST(sector[hitinfo->sect].extra, SECTFX_WARP_SECTOR))
{
if (TEST(wall[sector[hitinfo->sect].wallptr].cstat, CSTAT_WALL_WARP_HITSCAN))
if (TEST(sector[hitinfo->sect].firstWall()->cstat, CSTAT_WALL_WARP_HITSCAN))
{
// hit the floor of a sector that is a warping sector
if (Warp(&hitinfo->pos.x, &hitinfo->pos.y, &hitinfo->pos.z, &hitinfo->sect))

View file

@ -368,16 +368,14 @@ int DoRotator(DSWActor* actor)
if (!pivot)
return 0;
startwall = sp->sector()->wallptr;
endwall = startwall + sp->sector()->wallnum - 1;
// move points
for (w = startwall, ndx = 0; w <= endwall; w++)
ndx = 0;
for(auto& wal : wallsofsector(sp->sector()))
{
vec2_t const orig = { r->origX[ndx], r->origY[ndx] };
rotatepoint(pivot->pos.vec2, orig, r->pos, &nxy);
dragpoint(w, nxy.x, nxy.y);
dragpoint(&wal, nxy.x, nxy.y);
ndx++;
}