zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-01 09:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- renamed RR’s weapon sprites to match their weapons

Browse source
This commit is contained in:
Christoph Oelckers 2022-10-17 18:22:38 +02:00
parent 95d10bd73c
commit 35f6ece473
6 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1971,7 +1971,7 @@ static void rrra_specialstats()
else else
{ {
act->spr.picnum = RRTILE8162 + 6; act->spr.picnum = RRTILE8162 + 6;
spawn(act, HEAVYHBOMB); spawn(act, DYNAMITE);
ps[screenpeek].SlotWin |= 2; ps[screenpeek].SlotWin |= 2;
S_PlayActorSound(52, act); S_PlayActorSound(52, act);
} }
@ -2047,7 +2047,7 @@ static void rrra_specialstats()
else else
{ {
act->spr.picnum = RRTILE8589 + 6; act->spr.picnum = RRTILE8589 + 6;
spawn(act, HEAVYHBOMB); spawn(act, DYNAMITE);
ps[screenpeek].SlotWin |= 2; ps[screenpeek].SlotWin |= 2;
S_PlayActorSound(342, act); S_PlayActorSound(342, act);
} }
@ -2425,7 +2425,7 @@ DETONATEB:
switch (actor->spr.picnum) switch (actor->spr.picnum)
{ {
case POWDERKEG: m = gs.tripbombblastradius; break; // powder keg case POWDERKEG: m = gs.tripbombblastradius; break; // powder keg
case HEAVYHBOMB: m = gs.pipebombblastradius; break; case DYNAMITE: m = gs.pipebombblastradius; break;
case HBOMBAMMO: m = gs.pipebombblastradius; break; case HBOMBAMMO: m = gs.pipebombblastradius; break;
case MORTER: m = gs.morterblastradius; break; case MORTER: m = gs.morterblastradius; break;
case CHEERBOMB: m = gs.morterblastradius; break; case CHEERBOMB: m = gs.morterblastradius; break;
@ -2461,7 +2461,7 @@ DETONATEB:
return; return;
} }
} }
else if (actor->spr.picnum == HEAVYHBOMB && xx < 788 / 16. && actor->temp_data[0] > 7 && actor->vel.X == 0) else if (actor->spr.picnum == DYNAMITE && xx < 788 / 16. && actor->temp_data[0] > 7 && actor->vel.X == 0)
if (cansee(actor->spr.pos.plusZ(-8), actor->sector(), ps[p].pos, ps[p].cursector)) if (cansee(actor->spr.pos.plusZ(-8), actor->sector(), ps[p].pos, ps[p].cursector))
if (ps[p].ammo_amount[DYNAMITE_WEAPON] < gs.max_ammo_amount[DYNAMITE_WEAPON]) if (ps[p].ammo_amount[DYNAMITE_WEAPON] < gs.max_ammo_amount[DYNAMITE_WEAPON])
if (actor->spr.pal == 0) if (actor->spr.pal == 0)
@ -2488,9 +2488,9 @@ DETONATEB:
SetPlayerPal(&ps[p], PalEntry(32, 0, 32, 0)); SetPlayerPal(&ps[p], PalEntry(32, 0, 32, 0));
} }
if (Owner && (Owner->attackertype != HEAVYHBOMB || ud.respawn_items == 0 || Owner->spr.picnum == APLAYER)) if (Owner && (Owner->attackertype != DYNAMITE || ud.respawn_items == 0 || Owner->spr.picnum == APLAYER))
{ {
if (actor->spr.picnum == HEAVYHBOMB && Owner->spr.picnum != APLAYER && ud.coop) if (actor->spr.picnum == DYNAMITE && Owner->spr.picnum != APLAYER && ud.coop)
return; return;
deletesprite(actor); deletesprite(actor);
return; return;
@ -2814,7 +2814,7 @@ void moveactors_r(void)
if (!isRRRA()) break; if (!isRRRA()) break;
[[fallthrough]]; [[fallthrough]];
case MORTER: case MORTER:
case HEAVYHBOMB: case DYNAMITE:
heavyhbomb(act); heavyhbomb(act);
continue; continue;

18
source/games/duke/src/animatesprites_r.cpp
View file

@ -371,17 +371,17 @@ void animatesprites_r(tspriteArray& tsprites, const DVector2& viewVec, DAngle vi
{ {
case PISTOL_WEAPON: newtspr->picnum = FIRSTGUNSPRITE; break; case PISTOL_WEAPON: newtspr->picnum = FIRSTGUNSPRITE; break;
case SHOTGUN_WEAPON: newtspr->picnum = SHOTGUNSPRITE; break; case SHOTGUN_WEAPON: newtspr->picnum = SHOTGUNSPRITE; break;
case RIFLEGUN_WEAPON: newtspr->picnum = CHAINGUNSPRITE; break; case RIFLEGUN_WEAPON: newtspr->picnum = RIFLEGUNSPRITE; break;
case CROSSBOW_WEAPON: newtspr->picnum = RPGSPRITE; break; case CROSSBOW_WEAPON: newtspr->picnum = CROSSBOWSPRITE; break;
case CHICKEN_WEAPON: newtspr->picnum = RPGSPRITE; break; case CHICKEN_WEAPON: newtspr->picnum = CROSSBOWSPRITE; break;
case THROWINGDYNAMITE_WEAPON: case THROWINGDYNAMITE_WEAPON:
case DYNAMITE_WEAPON: newtspr->picnum = HEAVYHBOMB; break; case DYNAMITE_WEAPON: newtspr->picnum = DYNAMITE; break;
case POWDERKEG_WEAPON: newtspr->picnum = POWDERKEG; break; case POWDERKEG_WEAPON: newtspr->picnum = POWDERKEG; break;
case BOWLING_WEAPON: newtspr->picnum = 3437; break; case BOWLING_WEAPON: newtspr->picnum = BOWLINGBALLSPRITE; break;
case THROWSAW_WEAPON: newtspr->picnum = SHRINKSPARK; break; case THROWSAW_WEAPON: newtspr->picnum = RIPSAWSPRITE; break;
case BUZZSAW_WEAPON: newtspr->picnum = SHRINKSPARK; break; case BUZZSAW_WEAPON: newtspr->picnum = RIPSAWSPRITE; break;
case ALIENBLASTER_WEAPON: newtspr->picnum = DEVISTATORSPRITE; break; case ALIENBLASTER_WEAPON: newtspr->picnum = ALIENBLASTERSPRITE; break;
case TIT_WEAPON: newtspr->picnum = FREEZESPRITE; break; case TIT_WEAPON: newtspr->picnum = TITSPRITE; break;
} }
if (h->GetOwner()) newtspr->pos.Z = ps[p].pos.Z - 12; if (h->GetOwner()) newtspr->pos.Z = ps[p].pos.Z - 12;

16
source/games/duke/src/flags_r.cpp
View file

@ -233,7 +233,7 @@ void initactorflags_r()
setflag(SFLAG_NOINTERPOLATE, { CRANEPOLE }); setflag(SFLAG_NOINTERPOLATE, { CRANEPOLE });
setflag(SFLAG_FALLINGFLAMMABLE, { BOX }); setflag(SFLAG_FALLINGFLAMMABLE, { BOX });
setflag(SFLAG_INFLAME, { RADIUSEXPLOSION, RPG, FIRELASER, HYDRENT, HEAVYHBOMB, POWDERKEG, COOLEXPLOSION1, OWHIP, UWHIP }); setflag(SFLAG_INFLAME, { RADIUSEXPLOSION, RPG, FIRELASER, HYDRENT, DYNAMITE, POWDERKEG, COOLEXPLOSION1, OWHIP, UWHIP });
if (isRRRA()) setflag(SFLAG_INFLAME, { RPG2 }); if (isRRRA()) setflag(SFLAG_INFLAME, { RPG2 });
setflag(SFLAG_NOFLOORFIRE, { TREE1, TREE2 }); setflag(SFLAG_NOFLOORFIRE, { TREE1, TREE2 });
setflag(SFLAG_HITRADIUS_FLAG1, { BOX, TREE1, TREE2, TIRE }); setflag(SFLAG_HITRADIUS_FLAG1, { BOX, TREE1, TREE2, TIRE });
@ -246,9 +246,9 @@ void initactorflags_r()
setflag(SFLAG2_EXPLOSIVE, {RPG, RADIUSEXPLOSION, SEENINE, OOZFILTER }); setflag(SFLAG2_EXPLOSIVE, {RPG, RADIUSEXPLOSION, SEENINE, OOZFILTER });
if (isRRRA()) setflag(SFLAG2_EXPLOSIVE, { RPG2 }); if (isRRRA()) setflag(SFLAG2_EXPLOSIVE, { RPG2 });
setflag(SFLAG2_BRIGHTEXPLODE, { SEENINE, OOZFILTER }); setflag(SFLAG2_BRIGHTEXPLODE, { SEENINE, OOZFILTER });
setflag(SFLAG2_DOUBLEDMGTHRUST, { RADIUSEXPLOSION, RPG, HYDRENT, HEAVYHBOMB, SEENINE, OOZFILTER, EXPLODINGBARREL, POWDERKEG }); setflag(SFLAG2_DOUBLEDMGTHRUST, { RADIUSEXPLOSION, RPG, HYDRENT, DYNAMITE, SEENINE, OOZFILTER, EXPLODINGBARREL, POWDERKEG });
if (isRRRA()) setflag(SFLAG2_DOUBLEDMGTHRUST, { RPG2 }); if (isRRRA()) setflag(SFLAG2_DOUBLEDMGTHRUST, { RPG2 });
setflag(SFLAG2_BREAKMIRRORS, { RADIUSEXPLOSION, RPG, HYDRENT, HEAVYHBOMB, SEENINE, OOZFILTER, EXPLODINGBARREL, POWDERKEG }); setflag(SFLAG2_BREAKMIRRORS, { RADIUSEXPLOSION, RPG, HYDRENT, DYNAMITE, SEENINE, OOZFILTER, EXPLODINGBARREL, POWDERKEG });
if (isRRRA()) setflag(SFLAG2_BREAKMIRRORS, { RPG2 }); if (isRRRA()) setflag(SFLAG2_BREAKMIRRORS, { RPG2 });
setflag(SFLAG2_CAMERA, { CAMERA1 }); setflag(SFLAG2_CAMERA, { CAMERA1 });
@ -265,8 +265,8 @@ void initactorflags_r()
gs.actorinfo[RPG2].flags |= SFLAG_FORCEAUTOAIM; gs.actorinfo[RPG2].flags |= SFLAG_FORCEAUTOAIM;
gs.weaponsandammosprites[0] = RPGSPRITE; gs.weaponsandammosprites[0] = CROSSBOWSPRITE;
gs.weaponsandammosprites[1] = CHAINGUNSPRITE; gs.weaponsandammosprites[1] = RIFLEGUNSPRITE;
gs.weaponsandammosprites[2] = DEVISTATORAMMO; gs.weaponsandammosprites[2] = DEVISTATORAMMO;
gs.weaponsandammosprites[3] = RPGAMMO; gs.weaponsandammosprites[3] = RPGAMMO;
gs.weaponsandammosprites[4] = RPGAMMO; gs.weaponsandammosprites[4] = RPGAMMO;
@ -276,9 +276,9 @@ void initactorflags_r()
gs.weaponsandammosprites[8] = STEROIDS; gs.weaponsandammosprites[8] = STEROIDS;
gs.weaponsandammosprites[9] = RPGAMMO; gs.weaponsandammosprites[9] = RPGAMMO;
gs.weaponsandammosprites[10] = RPGAMMO; gs.weaponsandammosprites[10] = RPGAMMO;
gs.weaponsandammosprites[11] = RPGSPRITE; gs.weaponsandammosprites[11] = CROSSBOWSPRITE;
gs.weaponsandammosprites[12] = RPGAMMO; gs.weaponsandammosprites[12] = RPGAMMO;
gs.weaponsandammosprites[13] = FREEZESPRITE; gs.weaponsandammosprites[13] = TITSPRITE;
gs.weaponsandammosprites[14] = FREEZEAMMO; gs.weaponsandammosprites[14] = FREEZEAMMO;
TILE_BOX = BOX; TILE_BOX = BOX;
@ -326,4 +326,4 @@ void initactorflags_r()
gs.playerheight = PHEIGHT_RR; gs.playerheight = PHEIGHT_RR;
} }
END_DUKE_NS END_DUKE_NS

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

@ -8,14 +8,14 @@ y(RRTILE18, 18)
y(RRTILE19, 19) y(RRTILE19, 19)
x(ARROW, 20) x(ARROW, 20)
x(FIRSTGUNSPRITE, 21) x(FIRSTGUNSPRITE, 21)
x(CHAINGUNSPRITE, 22) x(RIFLEGUNSPRITE, 22)
x(RPGSPRITE, 23) x(CROSSBOWSPRITE, 23)
x(FREEZESPRITE, 24) x(TITSPRITE, 24)
x(SHRINKERSPRITE, 25) x(RIPSAWSPRITE, 25)
x(HEAVYHBOMB, 26) x(DYNAMITE, 26)
x(POWDERKEG, 27) x(POWDERKEG, 27)
x(SHOTGUNSPRITE, 28) x(SHOTGUNSPRITE, 28)
x(DEVISTATORSPRITE, 29) x(ALIENBLASTERSPRITE, 29)
x(HEALTHBOX, 30) x(HEALTHBOX, 30)
x(AMMOBOX, 31) x(AMMOBOX, 31)
x(GROWSPRITEICON, 32) x(GROWSPRITEICON, 32)

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

@ -1047,7 +1047,7 @@ void selectweapon_r(int snum, int weap)
DukeStatIterator it(STAT_ACTOR); DukeStatIterator it(STAT_ACTOR);
while (auto act = it.Next()) while (auto act = it.Next())
{ {
if (act->spr.picnum == HEAVYHBOMB && act->GetOwner() == p->GetActor()) if (act->spr.picnum == DYNAMITE && act->GetOwner() == p->GetActor())
{ {
p->gotweapon[DYNAMITE_WEAPON] = true; p->gotweapon[DYNAMITE_WEAPON] = true;
j = THROWINGDYNAMITE_WEAPON; j = THROWINGDYNAMITE_WEAPON;
@ -1460,8 +1460,8 @@ int doincrements_r(player_struct* p)
void checkweapons_r(player_struct* p) void checkweapons_r(player_struct* p)
{ {
static const uint16_t weapon_sprites[MAX_WEAPONS] = { KNEE, FIRSTGUNSPRITE, SHOTGUNSPRITE, static const uint16_t weapon_sprites[MAX_WEAPONS] = { KNEE, FIRSTGUNSPRITE, SHOTGUNSPRITE,
CHAINGUNSPRITE, RPGSPRITE, HEAVYHBOMB, SHRINKERSPRITE, DEVISTATORSPRITE, RIFLEGUNSPRITE, DYNAMITE, CROSSBOWSPRITE, RIPSAWSPRITE, ALIENBLASTERSPRITE,
POWDERKEG, BOWLINGBALLSPRITE, FREEZEBLAST, HEAVYHBOMB }; POWDERKEG, BOWLINGBALLSPRITE, TITSPRITE, DYNAMITE };
if (isRRRA()) if (isRRRA())
{ {
@ -2710,7 +2710,7 @@ static void operateweapon(int snum, ESyncBits actions, sectortype* psectp)
zvel = -4 + p->horizon.sum().Tan() * 10.; zvel = -4 + p->horizon.sum().Tan() * 10.;
} }
auto spawned = CreateActor(p->cursector, p->pos + p->angle.ang.ToVector() * 16, HEAVYHBOMB, -16, DVector2(0.140625, 0.140625), auto spawned = CreateActor(p->cursector, p->pos + p->angle.ang.ToVector() * 16, DYNAMITE, -16, DVector2(0.140625, 0.140625),
p->angle.ang, vel + p->hbomb_hold_delay * 2, zvel, pact, 1); p->angle.ang, vel + p->hbomb_hold_delay * 2, zvel, pact, 1);
if (spawned) if (spawned)

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

@ -1038,7 +1038,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
if(krand() & 4) act->spr.cstat |= CSTAT_SPRITE_XFLIP; if(krand() & 4) act->spr.cstat |= CSTAT_SPRITE_XFLIP;
break; break;
} }
case HEAVYHBOMB: case DYNAMITE:
act->SetOwner(act); act->SetOwner(act);
act->spr.scale = DVector2(0.140625, 0.140625); act->spr.scale = DVector2(0.140625, 0.140625);
act->spr.yint = 4; act->spr.yint = 4;
@ -1065,12 +1065,12 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
case HOLODUKE: case HOLODUKE:
case FIRSTGUNSPRITE: case FIRSTGUNSPRITE:
case CHAINGUNSPRITE: case RIFLEGUNSPRITE:
case SHOTGUNSPRITE: case SHOTGUNSPRITE:
case RPGSPRITE: case CROSSBOWSPRITE:
case SHRINKERSPRITE: case RIPSAWSPRITE:
case FREEZESPRITE: case TITSPRITE:
case DEVISTATORSPRITE: case ALIENBLASTERSPRITE:
case SHOTGUNAMMO: case SHOTGUNAMMO:
case FREEZEAMMO: case FREEZEAMMO:
@ -1202,17 +1202,17 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
act->spr.yint = 4; act->spr.yint = 4;
act->vel.X = 2; act->vel.X = 2;
break; break;
case RPGSPRITE: case CROSSBOWSPRITE:
act->spr.scale = DVector2(0.25, 0.21875); act->spr.scale = DVector2(0.25, 0.21875);
break; break;
case RPG2SPRITE: case RPG2SPRITE:
if (!isRRRA()) goto default_case; if (!isRRRA()) goto default_case;
act->spr.scale = DVector2(0.34375, 0.3125); act->spr.scale = DVector2(0.34375, 0.3125);
break; break;
case SHRINKERSPRITE: case RIPSAWSPRITE:
act->spr.scale = DVector2(0.34375, 0.203125); act->spr.scale = DVector2(0.34375, 0.203125);
break; break;
case DEVISTATORSPRITE: case ALIENBLASTERSPRITE:
act->spr.scale = DVector2(0.28125, 0.265625); act->spr.scale = DVector2(0.28125, 0.265625);
break; break;
case SAWAMMO: case SAWAMMO:
@ -1227,7 +1227,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
case ATOMICHEALTH: case ATOMICHEALTH:
act->spr.scale = DVector2(0.125, 0.125); act->spr.scale = DVector2(0.125, 0.125);
break; break;
case FREEZESPRITE: case TITSPRITE:
act->spr.scale = DVector2(0.265625, 0.25); act->spr.scale = DVector2(0.265625, 0.25);
break; break;
} }