thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

No Special Stage ringbox, always Record Attack ringbox

Browse source
This commit is contained in:
AJ Martinez 2023-08-11 01:15:34 -07:00
parent 424ad0bdb7
commit cd28e4d150
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/objects/random-item.c
View file

@ -18,6 +18,7 @@
#include "../r_defs.h" #include "../r_defs.h"
#include "../k_battle.h" #include "../k_battle.h"
#include "../m_random.h" #include "../m_random.h"
#include "../k_specialstage.h" // specialstageinfo
#define FLOAT_HEIGHT ( 12 * FRACUNIT ) #define FLOAT_HEIGHT ( 12 * FRACUNIT )
#define FLOAT_TIME ( 2 * TICRATE ) #define FLOAT_TIME ( 2 * TICRATE )
@ -115,9 +116,13 @@ void Obj_RandomItemVisuals(mobj_t *mobj)
// //
// Then extraval1 starts ticking up and triggers the transformation from Ringbox to Random Item. // Then extraval1 starts ticking up and triggers the transformation from Ringbox to Random Item.
if (mobj->fuse == 0 && !(mobj->flags & MF_NOCLIPTHING) && !(mobj->flags2 & MF2_AMBUSH) if (mobj->fuse == 0 && !(mobj->flags & MF_NOCLIPTHING) && !(mobj->flags2 & MF2_AMBUSH)
&& !cv_thunderdome.value && !(modeattacking & ATTACKING_SPB)) && !cv_thunderdome.value && (modeattacking == 0))
{ {
mobj->extravalue1++; mobj->extravalue1++;
if (specialstageinfo.valid) // Players need ammo in Special, transform to RANDOMITEM right away!
mobj->extravalue1 = max(mobj->extravalue1, RINGBOX_TIME);
if (mobj->extravalue1 == RINGBOX_TIME) if (mobj->extravalue1 == RINGBOX_TIME)
{ {
// Sync the position in RINGBOX and RANDOMITEM animations. // Sync the position in RINGBOX and RANDOMITEM animations.

3
src/p_inter.c
View file

@ -207,7 +207,8 @@ static void P_ItemPop(mobj_t *actor)
Obj_SpawnItemDebrisEffects(actor, actor->target); Obj_SpawnItemDebrisEffects(actor, actor->target);
P_SetMobjState(actor, S_RINGBOX1); if (!specialstageinfo.valid) // In Special, you'll respawn as a Ring Box (random-item.c), don't confuse the player.
P_SetMobjState(actor, S_RINGBOX1);
actor->extravalue1 = 0; actor->extravalue1 = 0;
// de-solidify // de-solidify