zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- wrap actor index storage in sector in the script index API.

Browse source
This commit is contained in:
Christoph Oelckers 2020-11-04 19:04:20 +01:00
parent 471a25f819
commit 7a95c1661e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/games/duke/src/player_r.cpp
View file

@ -4030,7 +4030,8 @@ HORIZONLY:
psect = s->sectnum;
if (ud.clipping == 0 && sector[psect].lotag == ST_31_TWO_WAY_TRAIN)
{
if (sprite[sector[psect].hitag].xvel && hittype[sector[psect].hitag].temp_data[0] == 0) // hijack
auto act = ScriptIndexToActor(sector[psect].hitag);
if (act && act->s.xvel && act->temp_data[0] == 0)
{
quickkill(p);
return;

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

@ -961,7 +961,7 @@ void spawneffector(DDukeActor* actor)
if (sp->pal) sp->clipdist = 1;
else sp->clipdist = 0;
t[3] = sector[sect].floorz;
sector[sect].hitag = actor->GetIndex(); // hijack
sector[sect].hitag = ActorToScriptIndex(actor);
}
DukeSpriteIterator it;
@ -1014,7 +1014,7 @@ void spawneffector(DDukeActor* actor)
sp->extra = 0;
else sp->extra = 1;
sector[sect].hitag = actor->GetIndex(); // hijack
sector[sect].hitag = ActorToScriptIndex(actor);
int j = 0;