zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-11 03:01:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

- more wall cleanup

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-24 22:07:27 +01:00
parent 031ad6e4a5
commit bb315f8148
2 changed files with 7 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
source/games/sw/src/sprite.cpp
View file

@ -1567,58 +1567,6 @@ void PreMapCombineFloors(void)
}
}
#if 0
// example of way to traverse through sectors from closest to farthest
void TraverseSectors(short start_sect)
{
int i, j, k;
short sectlist[M AXSECTORS];
short sectlistplc, sectlistend, sect, startwall, endwall, nextSector;
sectlist[0] = start_sect;
sectlistplc = 0; sectlistend = 1;
while (sectlistplc < sectlistend)
{
sect = sectlist[sectlistplc++];
startwall = sector[sect].wallptr;
endwall = startwall + sector[sect].wallnum;
for (j=startwall; j<endwall; j++)
{
nextSector = wall[j].nextSector;
if (nextSector < 0)
continue;
// make sure its not on the list
for (k = sectlistend-1; k >= 0; k--)
{
if (sectlist[k] == nextSector)
break;
}
// if its not on the list add it to the end
if (k < 0)
sectlist[sectlistend++] = nextSector;
}
}
// list is finished - can now traverse it
#if 0
sect = pp->cursectnum;
for (j=0; j<sectlistend; j++)
{
if (sectlist[j] == sect)
{
break;
}
}
#endif
}
#endif
void SpriteSetupPost(void)
{
@ -2259,27 +2207,21 @@ void SpriteSetup(void)
u->WaitTics = time*15; // 1/8 of a sec
u->Tics = 0;
startwall = sp->sector()->wallptr;
endwall = startwall + sp->sector()->wallnum - 1;
// count walls of sector
for (w = startwall, wallcount = 0; w <= endwall; w++)
wallcount++;
u->rotator.Alloc();
u->rotator->open_dest = SP_TAG5(sp);
u->rotator->speed = SP_TAG7(sp);
u->rotator->vel = SP_TAG8(sp);
u->rotator->pos = 0; // closed
u->rotator->tgt = u->rotator->open_dest; // closed
u->rotator->SetNumWalls(wallcount);
u->rotator->SetNumWalls(sp->sector()->wallnum);
u->rotator->orig_speed = u->rotator->speed;
for (w = startwall, wallcount = 0; w <= endwall; w++)
wallcount = 0;
for(auto& wal : wallsofsector(sp->sector()))
{
u->rotator->origX[wallcount] = wall[w].x;
u->rotator->origY[wallcount] = wall[w].y;
u->rotator->origX[wallcount] = wal.x;
u->rotator->origY[wallcount] = wal.y;
wallcount++;
}

4
source/games/sw/src/weapon.cpp
View file

@ -8417,8 +8417,8 @@ bool SlopeBounce(DSWActor* actor, bool *hit_wall)
*hit_wall = false;
// get angle of the first wall of the sector
k = sector[hit_sector].wallptr;
daang = getangle(wall[k].delta());
auto wallp = sector[hit_sector].firstWall();
daang = getangle(wallp->delta());
// k is now the slope of the ceiling or floor