thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

A_ItemPop: var1 determines roulette or sphere award

Browse source
This commit is contained in:
James R 2021-12-15 22:32:14 -08:00
parent cfe8a1bfa4
commit ccdbd9ccc9
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/info.c
View file

@ -4074,6 +4074,7 @@ state_t states[NUMSTATES] =
{SPR_SBOX, 18|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX11}, // S_SPHEREBOX10 {SPR_SBOX, 18|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX11}, // S_SPHEREBOX10
{SPR_SBOX, 20|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX12}, // S_SPHEREBOX11 {SPR_SBOX, 20|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX12}, // S_SPHEREBOX11
{SPR_SBOX, 22|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX1}, // S_SPHEREBOX12 {SPR_SBOX, 22|FF_FULLBRIGHT|FF_ANIMATE|FF_GLOBALANIM, 4, {NULL}, 1, 1, S_SPHEREBOX1}, // S_SPHEREBOX12
{SPR_NULL, 0, 0, {A_ItemPop}, 1, 0, S_NULL}, // S_DEADSPHEREBOX
{SPR_RPOP, FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_RANDOMITEMPOP2}, // S_RANDOMITEMPOP1 {SPR_RPOP, FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_RANDOMITEMPOP2}, // S_RANDOMITEMPOP1
{SPR_RPOP, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_RANDOMITEMPOP3}, // S_RANDOMITEMPOP2 {SPR_RPOP, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_RANDOMITEMPOP3}, // S_RANDOMITEMPOP2
@ -23044,7 +23045,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound sfx_None, // painsound
S_NULL, // meleestate S_NULL, // meleestate
S_NULL, // missilestate S_NULL, // missilestate
S_DEADRANDOMITEM, // deathstate S_DEADSPHEREBOX, // deathstate
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_kc2e, // deathsound sfx_kc2e, // deathsound
60*FRACUNIT, // speed 60*FRACUNIT, // speed

1
src/info.h
View file

@ -4467,6 +4467,7 @@ typedef enum state
S_SPHEREBOX10, S_SPHEREBOX10,
S_SPHEREBOX11, S_SPHEREBOX11,
S_SPHEREBOX12, S_SPHEREBOX12,
S_DEADSPHEREBOX,
// Random Item Pop // Random Item Pop
S_RANDOMITEMPOP1, S_RANDOMITEMPOP1,

6
src/p_enemy.c
View file

@ -13254,6 +13254,8 @@ void A_ChangeHeight(mobj_t *actor)
void A_ItemPop(mobj_t *actor) void A_ItemPop(mobj_t *actor)
{ {
INT32 locvar1 = var1;
mobj_t *remains; mobj_t *remains;
mobjtype_t explode; mobjtype_t explode;
@ -13308,9 +13310,9 @@ void A_ItemPop(mobj_t *actor)
if (actor->info->deathsound) if (actor->info->deathsound)
S_StartSound(remains, actor->info->deathsound); S_StartSound(remains, actor->info->deathsound);
if (gametyperules & GTR_BUMPERS) if (locvar1 == 1)
P_GivePlayerSpheres(actor->target->player, actor->extravalue1); P_GivePlayerSpheres(actor->target->player, actor->extravalue1);
else else if (locvar1 == 0)
actor->target->player->itemroulette = 1; actor->target->player->itemroulette = 1;
remains->flags2 &= ~MF2_AMBUSH; remains->flags2 &= ~MF2_AMBUSH;