zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 12:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- renamed several of RR's sprites, mostly related to the chicken processing plant.

Browse source
This commit is contained in:
Christoph Oelckers 2022-11-20 21:16:24 +01:00
parent a76d166966
commit 476dd138c9
6 changed files with 74 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1890,7 +1890,7 @@ static void rrra_specialstats()
void rr_specialstats()
{
DukeStatIterator it(107);
DukeStatIterator it(STAT_LUMBERMILL);
while (auto act = it.Next())
{
if (act->spr.hitag == 100)
@ -1908,7 +1908,7 @@ void rr_specialstats()
act->spr.hitag = 0;
act->spr.pos.Z = act->sector()->floorz - 59.25;
act->spr.extra = 0;
act->spr.picnum = RRTILE3410;
act->spr.picnum = LUMBERBLADE1;
DukeStatIterator it2(STAT_DEFAULT);
while (auto act2 = it2.Next())
{
@ -1922,28 +1922,28 @@ void rr_specialstats()
if (chickenplant)
{
it.Reset(106);
it.Reset(STAT_CHICKENPLANT);
while (auto act = it.Next())
{
switch (act->spr.picnum)
{
case RRTILE285:
case CHICKENASPAWN:
act->spr.lotag--;
if (act->spr.lotag < 0)
{
spawn(act, RRTILE3190)->spr.angle = act->spr.angle;
spawn(act, CHICKENA)->spr.angle = act->spr.angle;
act->spr.lotag = 128;
}
break;
case RRTILE286:
case CHICKENCSPAWN:
act->spr.lotag--;
if (act->spr.lotag < 0)
{
spawn(act, RRTILE3192)->spr.angle = act->spr.angle;
spawn(act, CHICKENC)->spr.angle = act->spr.angle;
act->spr.lotag = 256;
}
break;
case RRTILE287:
case FEATHERSPAWN:
act->spr.lotag--;
if (act->spr.lotag < 0)
{
@ -1951,48 +1951,48 @@ void rr_specialstats()
act->spr.lotag = 84;
}
break;
case RRTILE288:
case CHICKENHEADSPAWN:
act->spr.lotag--;
if (act->spr.lotag < 0)
{
auto j = spawn(act, RRTILE3132);
auto j = spawn(act, CHICKENHEAD);
act->spr.lotag = 96;
if (j && !isRRRA()) S_PlayActorSound(472, j);
}
break;
case RRTILE289:
case LOAFSPAWN:
act->spr.lotag--;
if (act->spr.lotag < 0)
{
spawn(act, RRTILE3120)->spr.angle = act->spr.angle;
spawn(act, CHICKENLOAF)->spr.angle = act->spr.angle;
act->spr.lotag = 448;
}
break;
case RRTILE290:
case NUGGETSPAWN:
act->spr.lotag--;
if (act->spr.lotag < 0)
{
spawn(act, RRTILE3122)->spr.angle = act->spr.angle;
spawn(act, CHICKENNUGGET)->spr.angle = act->spr.angle;
act->spr.lotag = 64;
}
break;
case RRTILE291:
case ROASTSPAWN:
act->spr.lotag--;
if (act->spr.lotag < 0)
{
spawn(act, RRTILE3123)->spr.angle = act->spr.angle;
spawn(act, ROASTEDCHICKEN)->spr.angle = act->spr.angle;
act->spr.lotag = 512;
}
break;
case RRTILE292:
case BONELESSSPAWN:
act->spr.lotag--;
if (act->spr.lotag < 0)
{
spawn(act, RRTILE3124)->spr.angle = act->spr.angle;
spawn(act, BONELESSCHICKEN)->spr.angle = act->spr.angle;
act->spr.lotag = 224;
}
break;
case RRTILE293:
case JIBSSPAWN:
act->spr.lotag--;
if (act->spr.lotag < 0)
{
@ -2426,9 +2426,9 @@ void moveactors_r(void)
case RAT:
if (!rat(act, !isRRRA())) continue;
break;
case RRTILE3190:
case RRTILE3191:
case RRTILE3192:
case CHICKENA:
case CHICKENB:
case CHICKENC:
if (!chickenplant)
{
act->Destroy();
@ -2440,10 +2440,10 @@ void moveactors_r(void)
switch (sectp->lotag)
{
case 901:
act->spr.picnum = RRTILE3191;
act->spr.picnum = CHICKENB;
break;
case 902:
act->spr.picnum = RRTILE3192;
act->spr.picnum = CHICKENC;
break;
case 903:
if (act->spr.pos.Z >= sectp->floorz - 8)
@ -2464,10 +2464,10 @@ void moveactors_r(void)
}
break;
case RRTILE3120:
case RRTILE3122:
case RRTILE3123:
case RRTILE3124:
case CHICKENLOAF:
case CHICKENNUGGET:
case ROASTEDCHICKEN:
case BONELESSCHICKEN:
if (!chickenplant)
{
act->Destroy();
@ -2495,7 +2495,7 @@ void moveactors_r(void)
}
break;
case RRTILE3132:
case CHICKENHEAD:
if (!chickenplant)
{
act->Destroy();

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

@ -274,6 +274,8 @@ enum
STAT_DESTRUCT = 100,
STAT_BOWLING = 105,
STAT_CHICKENPLANT = 106,
STAT_LUMBERMILL = 107,
STAT_RABBITSPAWN = 119,
STAT_REMOVED = MAXSTATUS-2,
STAT_NETALLOC = MAXSTATUS-1

36
source/games/duke/src/namelist_r.h
View file

@ -161,15 +161,15 @@ y(BOWLINGPINSPOT, 280)
y(RRTILE281, 281)
y(BOWLINGBALLSPOT, 282)
y(RRTILE283, 283)
y(RRTILE285, 285)
y(RRTILE286, 286)
y(RRTILE287, 287)
y(RRTILE288, 288)
y(RRTILE289, 289)
y(RRTILE290, 290)
y(RRTILE291, 291)
y(RRTILE292, 292)
y(RRTILE293, 293)
x(CHICKENASPAWN, 285)
x(CHICKENCSPAWN, 286)
x(FEATHERSPAWN, 287)
x(CHICKENHEADSPAWN, 288)
x(LOAFSPAWN, 289)
x(NUGGETSPAWN, 290)
x(ROASTSPAWN, 291)
x(BONELESSSPAWN, 292)
x(JIBSSPAWN, 293)
y(RRTILE295, 295)
y(RRTILE296, 296)
y(RRTILE297, 297)
@ -883,12 +883,12 @@ y(RRTILE3114, 3114)
y(RRTILE3115, 3115)
y(RRTILE3116, 3116)
y(RRTILE3117, 3117)
y(RRTILE3120, 3120)
x(CHICKENLOAF, 3120)
y(RRTILE3121, 3121)
y(RRTILE3122, 3122)
y(RRTILE3123, 3123)
y(RRTILE3124, 3124)
y(RRTILE3132, 3132)
x(CHICKENNUGGET, 3122)
x(ROASTEDCHICKEN, 3123)
x(BONELESSCHICKEN, 3124)
x(CHICKENHEAD, 3132)
y(RRTILE3139, 3139)
y(RRTILE3144, 3144)
y(RRTILE3152, 3152)
@ -896,9 +896,9 @@ y(RRTILE3153, 3153)
y(RRTILE3155, 3155)
y(RRTILE3171, 3171)
y(RRTILE3172, 3172)
y(RRTILE3190, 3190)
y(RRTILE3191, 3191)
y(RRTILE3192, 3192)
x(CHICKENA, 3190)
x(CHICKENB, 3191)
x(CHICKENC, 3192)
y(RRTILE3195, 3195)
y(RRTILE3200, 3200)
y(RRTILE3201, 3201)
@ -944,7 +944,7 @@ x(CIRCLESTUCK, 3388)
x(SPIT, 3390)
x(GROWSPARK, 3395)
x(SHRINKSPARK, 3400)
y(RRTILE3410, 3410)
x(LUMBERBLADE1, 3410)
x(LUMBERBLADE, 3411)
x(FREEZE, 3415)
x(FIRELASER, 3420)

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

@ -3801,14 +3801,14 @@ HORIZONLY:
ChangeActorStat(clip.actor(), 1);
}
}
else if (!isRRRA() && clip.actor()->spr.picnum == RRTILE3410)
else if (!isRRRA() && clip.actor()->spr.picnum == LUMBERBLADE1)
{
quickkill(p);
S_PlayActorSound(446, pact);
}
if (isRRRA())
{
if (clip.actor()->spr.picnum == RRTILE3410)
if (clip.actor()->spr.picnum == LUMBERBLADE1)
{
quickkill(p);
S_PlayActorSound(446, pact);

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

@ -516,10 +516,10 @@ bool checkhitswitch_r(int snum, walltype* wwal, DDukeActor* act)
if (other->spr.picnum == DIPSWITCH3)
if (other->spr.hitag == 999)
{
DukeStatIterator it1(107);
DukeStatIterator it1(STAT_LUMBERMILL);
while (auto other2 = it1.Next())
{
if (other2->spr.picnum == RRTILE3410)
if (other2->spr.picnum == LUMBERBLADE1)
{
other2->spr.picnum++;
other2->spr.hitag = 100;

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

@ -65,9 +65,9 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
act->spr.extra = 0;
ChangeActorStat(act, STAT_BOWLING);
break;
case RRTILE3410:
case LUMBERBLADE1:
act->spr.extra = 0;
ChangeActorStat(act, 107);
ChangeActorStat(act, STAT_LUMBERMILL);
break;
case RRTILE8450:
if (!isRRRA()) goto default_case;
@ -145,21 +145,21 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
act->spr.extra = 0;
ChangeActorStat(act, 122);
break;
case RRTILE285:
case RRTILE286:
case RRTILE287:
case RRTILE288:
case RRTILE289:
case RRTILE290:
case RRTILE291:
case RRTILE292:
case RRTILE293:
case CHICKENASPAWN:
case CHICKENCSPAWN:
case FEATHERSPAWN:
case CHICKENHEADSPAWN:
case LOAFSPAWN:
case NUGGETSPAWN:
case ROASTSPAWN:
case BONELESSSPAWN:
case JIBSSPAWN:
act->spr.cstat = 0;
act->spr.cstat |= CSTAT_SPRITE_INVISIBLE;
act->spr.scale = DVector2(0, 0);
act->clipdist = 0;
act->spr.lotag = 0;
ChangeActorStat(act, 106);
ChangeActorStat(act, STAT_CHICKENPLANT);
break;
case RRTILE2460:
@ -453,7 +453,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
break;
case RRTILE295:
act->spr.cstat |= CSTAT_SPRITE_INVISIBLE;
ChangeActorStat(act, 107);
ChangeActorStat(act, STAT_LUMBERMILL);
break;
case RRTILE296:
case RRTILE297:
@ -461,44 +461,44 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
act->clipdist = 16;
ChangeActorStat(act, 108);
break;
case RRTILE3190:
case RRTILE3191:
case RRTILE3192:
case CHICKENA:
case CHICKENB:
case CHICKENC:
act->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
act->clipdist = 2;
act->spr.scale = DVector2(0.5, 0.40625);
act->vel.X = 2;
ChangeActorStat(act, STAT_ACTOR);
break;
case RRTILE3120:
case CHICKENLOAF:
act->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
act->clipdist = 2;
act->spr.scale = DVector2(0.1875, 0.15625);
act->vel.X = 2;
ChangeActorStat(act, STAT_ACTOR);
break;
case RRTILE3122:
case CHICKENNUGGET:
act->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
act->clipdist = 0.5;
act->spr.scale = DVector2(0.125, 0.09375);
act->vel.X = 1;
ChangeActorStat(act, STAT_ACTOR);
break;
case RRTILE3123:
case ROASTEDCHICKEN:
act->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
act->clipdist = 2;
act->spr.scale = DVector2(0.203125, 0.203125);
act->vel.X = 1;
ChangeActorStat(act, STAT_ACTOR);
break;
case RRTILE3124:
case BONELESSCHICKEN:
act->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
act->clipdist = 2;
act->spr.scale = DVector2(0.265625, 0.1875);
act->vel.X = 2;
ChangeActorStat(act, STAT_ACTOR);
break;
case RRTILE3132:
case CHICKENHEAD:
act->spr.cstat = CSTAT_SPRITE_BLOCK_ALL;
act->clipdist = 2;
act->spr.scale = DVector2(0.203125, 0.15625);