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

- named a few more of RR's items.

Browse source
This commit is contained in:
Christoph Oelckers 2022-11-20 21:39:56 +01:00
parent 1e421af8bc
commit 49055f1bfd
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1912,9 +1912,9 @@ void rr_specialstats()
DukeStatIterator it2(STAT_DEFAULT);
while (auto act2 = it2.Next())
{
if (act2->spr.picnum == 128)
if (act2->spr.picnum == DIPSWITCH3 + 1)
if (act2->spr.hitag == 999)
act2->spr.picnum = 127;
act2->spr.picnum = DIPSWITCH3;
}
}
}
@ -2034,19 +2034,19 @@ void rr_specialstats()
}
}
it.Reset(108);
it.Reset(STAT_TELEPORT);
while (auto act = it.Next())
{
if (act->spr.picnum == RRTILE296)
if (act->spr.picnum == RRTELEPORT)
{
double xx;
int p = findplayer(act, &xx);
if (xx < 128)
{
DukeStatIterator it2(108);
DukeStatIterator it2(STAT_TELEPORT);
while (auto act2 = it2.Next())
{
if (act2->spr.picnum == RRTILE297)
if (act2->spr.picnum == RRTELEPORTDEST)
{
ps[p].angle.ang = act2->spr.angle;
ps[p].pos = act2->spr.pos.plusZ(-36);

1
source/games/duke/src/constants.h
View file

@ -276,6 +276,7 @@ enum
STAT_BOWLING = 105,
STAT_CHICKENPLANT = 106,
STAT_LUMBERMILL = 107,
STAT_TELEPORT = 108,
STAT_RABBITSPAWN = 119,
STAT_REMOVED = MAXSTATUS-2,
STAT_NETALLOC = MAXSTATUS-1

6
source/games/duke/src/spawn_r.cpp
View file

@ -455,11 +455,11 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
act->spr.cstat |= CSTAT_SPRITE_INVISIBLE;
ChangeActorStat(act, STAT_LUMBERMILL);
break;
case RRTILE296:
case RRTILE297:
case RRTELEPORT:
case RRTELEPORTDEST:
act->spr.scale = DVector2(1, 1);
act->clipdist = 16;
ChangeActorStat(act, 108);
ChangeActorStat(act, STAT_TELEPORT);
break;
case CHICKENA:
case CHICKENB: