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

- SW: floatify slidor.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2022-01-30 15:15:32 +01:00
parent 71943abed0
commit 536c7e0c7b
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -250,7 +250,7 @@ void DoSlidorInterp(DSWActor* actor, INTERP_FUNC interp_func)
while (wal != startWall); while (wal != startWall);
} }
int DoSlidorMoveWalls(DSWActor* actor, int amt) int DoSlidorMoveWalls(DSWActor* actor, double amt)
{ {
auto sect = actor->sector(); auto sect = actor->sector();
@ -274,17 +274,17 @@ int DoSlidorMoveWalls(DSWActor* actor, int amt)
if (!wal->twoSided()) if (!wal->twoSided())
{ {
// white wall - move 4 points // white wall - move 4 points
wal->movexy(wal->wall_int_pos().X - amt, wal->wall_int_pos().Y); wal->move({ wal->pos.X - amt, wal->pos.Y });
pwal->movexy(pwal->wall_int_pos().X - amt, pwal->wall_int_pos().Y); pwal->move({ pwal->pos.X - amt, pwal->pos.Y });
wal->point2Wall()->movexy(wal->point2Wall()->wall_int_pos().X - amt, wal->point2Wall()->wall_int_pos().Y); wal->point2Wall()->move({ wal->point2Wall()->pos.X - amt, wal->point2Wall()->pos.Y });
auto pwal2 = wal->point2Wall()->point2Wall(); auto pwal2 = wal->point2Wall()->point2Wall();
pwal2->movexy(pwal2->wall_int_pos().X - amt, pwal2->wall_int_pos().Y); pwal2->move({ pwal2->pos.X - amt, pwal2->pos.Y });
} }
else else
{ {
// red wall - move 2 points // red wall - move 2 points
dragpoint(wal, wal->wall_int_pos().X - amt, wal->wall_int_pos().Y); dragpoint(wal, { wal->pos.X - amt, wal->pos.Y });
dragpoint(wal->point2Wall(), wal->point2Wall()->wall_int_pos().X - amt, wal->point2Wall()->wall_int_pos().Y); dragpoint(wal->point2Wall(), { wal->point2Wall()->pos.X - amt, wal->point2Wall()->pos.Y });
} }
break; break;
@ -299,17 +299,17 @@ int DoSlidorMoveWalls(DSWActor* actor, int amt)
if (!wal->twoSided()) if (!wal->twoSided())
{ {
// white wall - move 4 points // white wall - move 4 points
wal->movexy(wal->wall_int_pos().X + amt, wal->wall_int_pos().Y); wal->move({ wal->pos.X + amt, wal->pos.Y });
pwal->movexy(pwal->wall_int_pos().X + amt, pwal->wall_int_pos().Y); pwal->move({ pwal->pos.X + amt, pwal->pos.Y });
wal->point2Wall()->movexy(wal->point2Wall()->wall_int_pos().X + amt, wal->point2Wall()->wall_int_pos().Y); wal->point2Wall()->move({ wal->point2Wall()->pos.X + amt, wal->point2Wall()->pos.Y });
auto pwal2 = wal->point2Wall()->point2Wall(); auto pwal2 = wal->point2Wall()->point2Wall();
pwal2->movexy(pwal2->wall_int_pos().X + amt, pwal2->wall_int_pos().Y); pwal2->move({ pwal2->pos.X + amt, pwal2->pos.Y });
} }
else else
{ {
// red wall - move 2 points // red wall - move 2 points
dragpoint(wal, wal->wall_int_pos().X + amt, wal->wall_int_pos().Y); dragpoint(wal, { wal->pos.X + amt, wal->pos.Y });
dragpoint(wal->point2Wall(), wal->point2Wall()->wall_int_pos().X + amt, wal->point2Wall()->wall_int_pos().Y); dragpoint(wal->point2Wall(), { wal->point2Wall()->pos.X + amt, wal->point2Wall()->pos.Y });
} }
break; break;
@ -323,16 +323,16 @@ int DoSlidorMoveWalls(DSWActor* actor, int amt)
if (!wal->twoSided()) if (!wal->twoSided())
{ {
wal->movexy(wal->wall_int_pos().X, wal->wall_int_pos().Y - amt); wal->move({ wal->pos.X, wal->pos.Y - amt });
pwal->movexy(pwal->wall_int_pos().X, pwal->wall_int_pos().Y - amt); pwal->move({ pwal->pos.X, pwal->pos.Y - amt });
wal->point2Wall()->movexy(wal->point2Wall()->wall_int_pos().X, wal->point2Wall()->wall_int_pos().Y - amt); wal->point2Wall()->move({ wal->point2Wall()->pos.X, wal->point2Wall()->pos.Y - amt });
auto pwal2 = wal->point2Wall()->point2Wall(); auto pwal2 = wal->point2Wall()->point2Wall();
pwal2->movexy(pwal2->wall_int_pos().X, pwal2->wall_int_pos().Y - amt); pwal2->move({ pwal2->pos.X, pwal2->pos.Y - amt });
} }
else else
{ {
dragpoint(wal, wal->wall_int_pos().X, wal->wall_int_pos().Y - amt); dragpoint(wal, { wal->pos.X, wal->pos.Y - amt });
dragpoint(wal->point2Wall(), wal->point2Wall()->wall_int_pos().X, wal->point2Wall()->wall_int_pos().Y - amt); dragpoint(wal->point2Wall(), { wal->point2Wall()->pos.X, wal->point2Wall()->pos.Y - amt });
} }
break; break;
@ -346,16 +346,16 @@ int DoSlidorMoveWalls(DSWActor* actor, int amt)
if (!wal->twoSided()) if (!wal->twoSided())
{ {
wal->movexy(wal->wall_int_pos().X, wal->wall_int_pos().Y + amt); wal->move({ wal->pos.X, wal->pos.Y + amt });
pwal->movexy(pwal->wall_int_pos().X, pwal->wall_int_pos().Y + amt); pwal->move({ pwal->pos.X, pwal->pos.Y + amt });
wal->point2Wall()->movexy(wal->point2Wall()->wall_int_pos().X, wal->point2Wall()->wall_int_pos().Y + amt); wal->point2Wall()->move({ wal->point2Wall()->pos.X, wal->point2Wall()->pos.Y + amt });
auto pwal2 = wal->point2Wall()->point2Wall(); auto pwal2 = wal->point2Wall()->point2Wall();
pwal2->movexy(pwal2->wall_int_pos().X, pwal2->wall_int_pos().Y + amt); pwal2->move({ pwal2->pos.X, pwal2->pos.Y + amt });
} }
else else
{ {
dragpoint(wal, wal->wall_int_pos().X, wal->wall_int_pos().Y + amt); dragpoint(wal, { wal->pos.X, wal->pos.Y + amt });
dragpoint(wal->point2Wall(), wal->point2Wall()->wall_int_pos().X, wal->point2Wall()->wall_int_pos().Y + amt); dragpoint(wal->point2Wall(), { wal->point2Wall()->pos.X, wal->point2Wall()->pos.Y + amt });
} }
@ -372,7 +372,7 @@ int DoSlidorMoveWalls(DSWActor* actor, int amt)
int DoSlidorInstantClose(DSWActor* actor) int DoSlidorInstantClose(DSWActor* actor)
{ {
int diff; double diff;
auto startwall = actor->sector()->firstWall(); auto startwall = actor->sector()->firstWall();
auto wal = startwall; auto wal = startwall;
@ -382,22 +382,22 @@ int DoSlidorInstantClose(DSWActor* actor)
switch (wal->lotag) switch (wal->lotag)
{ {
case TAG_WALL_SLIDOR_LEFT: case TAG_WALL_SLIDOR_LEFT:
diff = wal->wall_int_pos().X - actor->spr.pos.X; diff = wal->pos.X - actor->float_pos().X;
DoSlidorMoveWalls(actor, diff); DoSlidorMoveWalls(actor, diff);
break; break;
case TAG_WALL_SLIDOR_RIGHT: case TAG_WALL_SLIDOR_RIGHT:
diff = wal->wall_int_pos().X - actor->spr.pos.X; diff = wal->pos.X - actor->float_pos().X;
DoSlidorMoveWalls(actor, -diff); DoSlidorMoveWalls(actor, -diff);
break; break;
case TAG_WALL_SLIDOR_UP: case TAG_WALL_SLIDOR_UP:
diff = wal->wall_int_pos().Y - actor->spr.pos.Y; diff = wal->pos.Y - actor->float_pos().Y;
DoSlidorMoveWalls(actor, diff); DoSlidorMoveWalls(actor, diff);
break; break;
case TAG_WALL_SLIDOR_DOWN: case TAG_WALL_SLIDOR_DOWN:
diff = wal->wall_int_pos().Y - actor->spr.pos.Y; diff = wal->pos.Y - actor->float_pos().Y;
DoSlidorMoveWalls(actor, -diff); DoSlidorMoveWalls(actor, -diff);
break; break;
} }
@ -534,7 +534,7 @@ int DoSlidor(DSWActor* actor)
} }
DoSlidorMoveWalls(actor, r->pos - old_pos); DoSlidorMoveWalls(actor, (r->pos - old_pos) * inttoworld);
if (kill) if (kill)
{ {