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

- Duke: Fix bad setup in initcrane() following actor sprite pointer cleanups.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-24 11:24:26 +11:00 committed by Christoph Oelckers
parent 0ebd7532b8
commit e15c887f90
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
source/games/duke/src/spawn.cpp
View file

@ -488,26 +488,24 @@ void initcrane(DDukeActor* actj, DDukeActor* act, int CRANEPOLE)
apt.poleactor = nullptr;
DukeStatIterator it(STAT_DEFAULT);
while (auto act = it.Next())
while (auto actk = it.Next())
{
if (act->spr.picnum == CRANEPOLE && act->spr.hitag == (act->spr.hitag))
if (actk->spr.picnum == CRANEPOLE && act->spr.hitag == actk->spr.hitag)
{
apt.poleactor = act;
apt.poleactor = actk;
act->temp_sect = act->spr.sector();
act->temp_sect = actk->spr.sector();
act->spr.xrepeat = 48;
act->spr.yrepeat = 128;
actk->spr.xrepeat = 48;
actk->spr.yrepeat = 128;
apt.polex = act->spr.pos.X;
apt.poley = act->spr.pos.Y;
apt.polex = actk->spr.pos.X;
apt.poley = actk->spr.pos.Y;
act->spr.pos.X = act->spr.pos.X;
act->spr.pos.Y = act->spr.pos.Y;
act->spr.pos.Z = act->spr.pos.Z;
act->spr.shade = act->spr.shade;
actk->spr.pos = act->spr.pos;
actk->spr.shade = act->spr.shade;
SetActor(act, act->spr.pos);
SetActor(actk, actk->spr.pos);
break;
}
}