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

- major cleanup and condensing of DoSlidorInterp

Browse source 
The logic here still looks very weird but let's keep it to ensure proper functioning.
This commit is contained in:
Christoph Oelckers 2021-11-24 16:45:31 +01:00
parent a93dbaf5fe
commit fe3a02420a
3 changed files with 35 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/core/interpolate.h
View file

@ -4,7 +4,8 @@
enum EInterpolationType
{
Interp_Sect_Floorz,
Interp_Invalid = -1,
Interp_Sect_Floorz = 0,
Interp_Sect_Ceilingz,
Interp_Sect_Floorheinum,
Interp_Sect_Ceilingheinum,

2
source/games/sw/src/misc.h
View file

@ -73,7 +73,7 @@ void DoSlidorMatch(PLAYERp pp, short match, bool);
bool TestSlidorMatchActive(short match);
void InterpSectorSprites(short sectnum, bool state);
using INTERP_FUNC = void(*)(int, int);
using INTERP_FUNC = void(*)(walltype*, int);
void SetSlidorActive(DSWActor*);
void DoSlidorInterp(DSWActor*, INTERP_FUNC);

137
source/games/sw/src/slidor.cpp
View file

@ -224,128 +224,55 @@ bool TestSlidorMatchActive(short match)
void DoSlidorInterp(DSWActor* actor, INTERP_FUNC interp_func)
{
auto sp = &actor->s();
short w, pw, startwall, endwall;
w = startwall = sp->sector()->wallptr;
endwall = startwall + sp->sector()->wallnum - 1;
auto sp = actor->s().sector();
// this code is just weird.
auto startWall = sp->firstWall();
auto endWall = sp->lastWall();
auto wal = startWall;
do
{
switch (wall[w].lotag)
auto pwal = wal - 1;
if (pwal < startWall)
pwal = endWall;
EInterpolationType type = Interp_Invalid;;
switch (wal->lotag)
{
case TAG_WALL_SLIDOR_LEFT:
{
// prev wall
pw = w - 1;
if (w < startwall)
pw = endwall;
uint16_t const nextwall = wall[w].nextwall;
if (!validWallIndex(nextwall))
{
// white wall - move 4 points
interp_func(w, Interp_Wall_X);
interp_func(pw, Interp_Wall_X);
interp_func(wall[w].point2, Interp_Wall_X);
interp_func(wall[wall[w].point2].point2, Interp_Wall_X);
}
else
{
// red wall - move 2 points
interp_func(w, Interp_Wall_X);
interp_func(wall[nextwall].point2, Interp_Wall_X);
interp_func(wall[w].point2, Interp_Wall_X);
interp_func(wall[wall[wall[w].point2].nextwall].point2, Interp_Wall_X);
}
break;
}
case TAG_WALL_SLIDOR_RIGHT:
type = Interp_Wall_X;
break;
case TAG_WALL_SLIDOR_UP:
case TAG_WALL_SLIDOR_DOWN:
type = Interp_Wall_Y;
break;
}
if (type != Interp_Invalid)
{
// prev wall
pw = w - 1;
if (w < startwall)
pw = endwall;
uint16_t const nextwall = wall[w].nextwall;
if (!validWallIndex(nextwall))
if (!wal->twoSided())
{
// white wall - move 4 points
interp_func(w, Interp_Wall_X);
interp_func(pw, Interp_Wall_X);
interp_func(wall[w].point2, Interp_Wall_X);
interp_func(wall[wall[w].point2].point2, Interp_Wall_X);
interp_func(wal, type);
interp_func(pwal, type);
interp_func(wal->point2Wall(), type);
interp_func(wal->point2Wall()->point2Wall(), type);
}
else
{
auto nextwall = wal->nextWall();
// red wall - move 2 points
interp_func(w, Interp_Wall_X);
interp_func(wall[nextwall].point2, Interp_Wall_X);
interp_func(wall[w].point2, Interp_Wall_X);
interp_func(wall[wall[wall[w].point2].nextwall].point2, Interp_Wall_X);
interp_func(wal, type);
interp_func(wal->nextWall()->point2Wall(), type);
interp_func(wal->point2Wall(), type);
if (wal->point2Wall()->twoSided())
interp_func(wal->point2Wall()->nextWall()->point2Wall(), type);
}
break;
}
case TAG_WALL_SLIDOR_UP:
{
// prev wall
pw = w - 1;
if (w < startwall)
pw = endwall;
uint16_t const nextwall = wall[w].nextwall;
if (!validWallIndex(nextwall))
{
interp_func(w, Interp_Wall_Y);
interp_func(pw, Interp_Wall_Y);
interp_func(wall[w].point2, Interp_Wall_Y);
interp_func(wall[wall[w].point2].point2, Interp_Wall_Y);
}
else
{
interp_func(w, Interp_Wall_Y);
interp_func(wall[nextwall].point2, Interp_Wall_Y);
interp_func(wall[w].point2, Interp_Wall_Y);
interp_func(wall[wall[wall[w].point2].nextwall].point2, Interp_Wall_Y);
}
break;
}
case TAG_WALL_SLIDOR_DOWN:
{
// prev wall
pw = w - 1;
if (w < startwall)
pw = endwall;
uint16_t const nextwall = wall[w].nextwall;
if (!validWallIndex(nextwall))
{
interp_func(w, Interp_Wall_Y);
interp_func(pw, Interp_Wall_Y);
interp_func(wall[w].point2, Interp_Wall_Y);
interp_func(wall[wall[w].point2].point2, Interp_Wall_Y);
}
else
{
interp_func(w, Interp_Wall_Y);
interp_func(wall[nextwall].point2, Interp_Wall_Y);
interp_func(wall[w].point2, Interp_Wall_Y);
interp_func(wall[wall[wall[w].point2].nextwall].point2, Interp_Wall_Y);
}
break;
}
}
w = wall[w].point2;
wal = wal->point2Wall();
}
while (w != startwall);
while (wal != startWall);
}
int DoSlidorMoveWalls(DSWActor* actor, int amt)