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

- the crane still stored a sector index in temp_data.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-18 21:05:27 +01:00
parent 69c21407a7
commit 9ab35816ea
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/duke/src/actors.cpp
View file

@ -652,7 +652,7 @@ void movecrane(DDukeActor *actor, int crane)
if (t[0] == 0) //Waiting to check the sector if (t[0] == 0) //Waiting to check the sector
{ {
DukeSectIterator it(t[1]); DukeSectIterator it(actor->temp_sect);
while (auto a2 = it.Next()) while (auto a2 = it.Next())
{ {
switch (a2->s->statnum) switch (a2->s->statnum)
@ -678,7 +678,7 @@ void movecrane(DDukeActor *actor, int crane)
} }
//IFMOVING; // JBF 20040825: see my rant above about this //IFMOVING; // JBF 20040825: see my rant above about this
ssp(actor, CLIPMASK0); ssp(actor, CLIPMASK0);
if (spri->sectnum == t[1]) if (spri->sector() == actor->temp_sect)
t[0]++; t[0]++;
} }
else if (t[0] == 2 || t[0] == 7) else if (t[0] == 2 || t[0] == 7)
@ -718,7 +718,7 @@ void movecrane(DDukeActor *actor, int crane)
spri->picnum++; spri->picnum++;
if (spri->picnum == (crane + 2)) if (spri->picnum == (crane + 2))
{ {
int p = checkcursectnums(&sector[t[1]]); int p = checkcursectnums(actor->temp_sect);
if (p >= 0 && ps[p].on_ground) if (p >= 0 && ps[p].on_ground)
{ {
actor->SetActiveCrane(true); actor->SetActiveCrane(true);
@ -728,7 +728,7 @@ void movecrane(DDukeActor *actor, int crane)
} }
else else
{ {
DukeSectIterator it(t[1]); DukeSectIterator it(actor->temp_sect);
while (auto a2 = it.Next()) while (auto a2 = it.Next())
{ {
switch (a2->s->statnum) switch (a2->s->statnum)

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

@ -509,7 +509,7 @@ void initcrane(DDukeActor* actj, DDukeActor* acti, int CRANEPOLE)
{ {
apt.poleactor = act; apt.poleactor = act;
t[1] = ss->sectnum; acti->temp_sect = ss->sector();
ss->xrepeat = 48; ss->xrepeat = 48;
ss->yrepeat = 128; ss->yrepeat = 128;