zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: reverted sector storage to temp_data[0] for the subway.

Browse source 
This was the ultimate revenge of the Spaghetti code: Somewhere in there, something needs this value in temp_data[0], but I cannot find where this is...
This commit is contained in:
Christoph Oelckers 2022-01-13 22:34:43 +01:00
parent 9375750a17
commit 24a67e194d
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2767,7 +2767,7 @@ void handle_se14(DDukeActor* actor, bool checkstat, int RPG, int JIBS6)
if (actor->GetOwner() == nullptr)
{
auto NewOwner = LocateTheLocator(actor->temp_data[3], actor->temp_sect);
auto NewOwner = LocateTheLocator(actor->temp_data[3], &sector[actor->temp_data[0]]);
if (NewOwner == nullptr)
{
@ -2785,11 +2785,11 @@ void handle_se14(DDukeActor* actor, bool checkstat, int RPG, int JIBS6)
if (Owner->spr.hitag & 1)
actor->temp_data[4] = sc->extra; //Slow it down
actor->temp_data[3]++;
auto NewOwner = LocateTheLocator(actor->temp_data[3], actor->temp_sect);
auto NewOwner = LocateTheLocator(actor->temp_data[3], &sector[actor->temp_data[0]]);
if (NewOwner == nullptr)
{
actor->temp_data[3] = 0;
NewOwner = LocateTheLocator(0, actor->temp_sect);
NewOwner = LocateTheLocator(0, &sector[actor->temp_data[0]]);
}
if (NewOwner) actor->SetOwner(NewOwner);
}
@ -2971,7 +2971,7 @@ void handle_se30(DDukeActor *actor, int JIBS6)
if (Owner == nullptr)
{
actor->temp_data[3] = !actor->temp_data[3];
Owner = LocateTheLocator(actor->temp_data[3], actor->temp_sect);
Owner = LocateTheLocator(actor->temp_data[3], &sector[actor->temp_data[0]]);
actor->SetOwner(Owner);
}
else
@ -3399,7 +3399,7 @@ void handle_se05(DDukeActor* actor, int FIRELASER)
actor->spr.pos.Z += actor->spr.zvel;
sc->addceilingz(actor->spr.zvel);
actor->temp_sect->addceilingz(actor->spr.zvel);
sector[actor->temp_data[0]].addceilingz(actor->spr.zvel);
ms(actor);
SetActor(actor, actor->spr.pos);
}
@ -4257,7 +4257,7 @@ void handle_se22(DDukeActor* actor)
auto sc = actor->sector();
if (actor->temp_data[1])
{
if (getanimationgoal(anim_ceilingz, actor->temp_sect) >= 0)
if (getanimationgoal(anim_ceilingz, &sector[actor->temp_data[0]]) >= 0)
sc->addceilingz(sc->extra * 9);
else actor->temp_data[1] = 0;
}

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

@ -689,7 +689,7 @@ static void handle_st29(sectortype* sptr, DDukeActor* actor)
{
act2->sector()->extra = -act2->sector()->extra;
act2->temp_sect = sptr;
act2->temp_data[0] = sectnum(sptr);
act2->temp_data[1] = 1;
}
}

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

@ -992,7 +992,7 @@ void spawneffector(DDukeActor* actor, TArray<DDukeActor*>* actors)
}
actor->SetOwner(nullptr);
actor->temp_sect = s;
actor->temp_data[0] = sectnum(s);
if (actor->spr.lotag != SE_30_TWO_WAY_TRAIN)
actor->temp_data[3] = actor->spr.hitag;