teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- renamed RR's TRIPBOMBSPRITE to POWDERKEG

Browse source
This commit is contained in:
Christoph Oelckers 2022-01-19 10:05:41 +01:00
parent 3d0c794224
commit c0a40cb7d7
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -195,7 +195,7 @@ void animatesprites_r(tspritetype* tsprite, int& spritesortcnt, int x, int y, in
case MONEY:
case MONEY + 1:
break;
case TRIPBOMBSPRITE:
case POWDERKEG:
continue;
case FORCESPHERE:
if (t->statnum == STAT_MISC && OwnerAc)
@ -390,7 +390,7 @@ void animatesprites_r(tspritetype* tsprite, int& spritesortcnt, int x, int y, in
case CHICKEN_WEAPON: newtspr->picnum = RPGSPRITE; break;
case THROWINGDYNAMITE_WEAPON:
case DYNAMITE_WEAPON: newtspr->picnum = HEAVYHBOMB; break;
case POWDERKEG_WEAPON: newtspr->picnum = TRIPBOMBSPRITE; break;
case POWDERKEG_WEAPON: newtspr->picnum = POWDERKEG; break;
case BOWLING_WEAPON: newtspr->picnum = 3437; break;
case THROWSAW_WEAPON: newtspr->picnum = SHRINKSPARK; break;
case BUZZSAW_WEAPON: newtspr->picnum = SHRINKSPARK; break;

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

@ -230,7 +230,7 @@ void initactorflags_r()
setflag(SFLAG_NOINTERPOLATE, { CRANEPOLE });
setflag(SFLAG_FALLINGFLAMMABLE, { BOX });
setflag(SFLAG_INFLAME, { RADIUSEXPLOSION, RPG, FIRELASER, HYDRENT, HEAVYHBOMB, TRIPBOMBSPRITE, COOLEXPLOSION1, OWHIP, UWHIP });
setflag(SFLAG_INFLAME, { RADIUSEXPLOSION, RPG, FIRELASER, HYDRENT, HEAVYHBOMB, POWDERKEG, COOLEXPLOSION1, OWHIP, UWHIP });
if (isRRRA()) setflag(SFLAG_INFLAME, { RPG2 });
setflag(SFLAG_NOFLOORFIRE, { TREE1, TREE2 });
setflag(SFLAG_HITRADIUS_FLAG1, { BOX, TREE1, TREE2, TIRE });

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

@ -13,7 +13,7 @@ x(RPGSPRITE, 23)
x(FREEZESPRITE, 24)
x(SHRINKERSPRITE, 25)
x(HEAVYHBOMB, 26)
x(TRIPBOMBSPRITE, 27)
x(POWDERKEG, 27)
x(SHOTGUNSPRITE, 28)
x(DEVISTATORSPRITE, 29)
x(HEALTHBOX, 30)

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

@ -891,7 +891,7 @@ void shoot_r(DDukeActor* actor, int atwith)
shootweapon(actor, p, sx, sy, sz, sa, atwith);
return;
case TRIPBOMBSPRITE:
case POWDERKEG:
{
auto j = spawn(actor, atwith);
if (j)
@ -1495,7 +1495,7 @@ void checkweapons_r(struct player_struct* p)
{
static const uint16_t weapon_sprites[MAX_WEAPONS] = { KNEE, FIRSTGUNSPRITE, SHOTGUNSPRITE,
CHAINGUNSPRITE, RPGSPRITE, HEAVYHBOMB, SHRINKERSPRITE, DEVISTATORSPRITE,
TRIPBOMBSPRITE, BOWLINGBALLSPRITE, FREEZEBLAST, HEAVYHBOMB };
POWDERKEG, BOWLINGBALLSPRITE, FREEZEBLAST, HEAVYHBOMB };
if (isRRRA())
{
@ -3162,7 +3162,7 @@ static void operateweapon(int snum, ESyncBits actions, sectortype* psectp)
EGS(p->cursector,
p->pos.X + p->angle.ang.bcos(-6),
p->pos.Y + p->angle.ang.bsin(-6),
p->pos.Z, TRIPBOMBSPRITE, -16, 9, 9,
p->pos.Z, POWDERKEG, -16, 9, 9,
p->angle.ang.asbuild(), k * 2, i, pact, 1);
}
p->kickback_pic++;

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

@ -1123,7 +1123,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
case HEATSENSOR:
case SHIELD:
case AIRTANK:
case TRIPBOMBSPRITE:
case POWDERKEG:
case COWPIE:
case HOLODUKE:
@ -1275,7 +1275,7 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
act->spr.xrepeat = 11;
act->spr.yrepeat = 11;
break;
case TRIPBOMBSPRITE:
case POWDERKEG:
act->spr.xrepeat = 11;
act->spr.yrepeat = 11;
act->spr.yvel = 4;