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

SPB Attack: medals, emblems, and fixes

Browse source
This commit is contained in:
AJ Martinez 2023-03-01 05:18:01 -07:00 • committed by James R
parent 6173ca47aa
commit f3f4ac16de
5 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/console.c
View file

@ -923,8 +923,10 @@ boolean CON_Responder(event_t *ev)
// check for console toggle key // check for console toggle key
if (ev->type != ev_console) if (ev->type != ev_console)
{ {
#ifndef DEVELOP // I have driven this course 45 times and I just want to give myself rocketsneakers
if (modeattacking || metalrecording || marathonmode) if (modeattacking || metalrecording || marathonmode)
return false; return false;
#endif
if (ev->data1 >= NUMKEYS) // See also: HUD_Responder if (ev->data1 >= NUMKEYS) // See also: HUD_Responder
{ {

5
src/g_game.c
View file

@ -514,7 +514,7 @@ void G_UpdateTimeStickerMedals(UINT16 map, boolean showownrecord)
} }
case ET_MAP: case ET_MAP:
{ {
if (emblem->flags & ME_SPBATTACK) if (emblem->flags & ME_SPBATTACK && cv_dummyspbattack.value)
break; break;
goto bademblem; goto bademblem;
} }
@ -522,6 +522,9 @@ void G_UpdateTimeStickerMedals(UINT16 map, boolean showownrecord)
goto bademblem; goto bademblem;
} }
if (cv_dummyspbattack.value && !(emblem->flags & ME_SPBATTACK))
return;
if (!gamedata->collected[(emblem-emblemlocations)] && gonnadrawtime) if (!gamedata->collected[(emblem-emblemlocations)] && gonnadrawtime)
break; break;

1
src/k_hud.c
View file

@ -1669,7 +1669,6 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, U
bombxoff = sqrt(bombxoff) - 5; bombxoff = sqrt(bombxoff) - 5;
bombxoff = max(0, min(bombxoff, widthbar)); bombxoff = max(0, min(bombxoff, widthbar));
V_DrawScaledPatch(160 + widthbar/2 - bombxoff, ybar - 7, FRACUNIT, W_CachePatchName("SPBMMAP", PU_CACHE)); V_DrawScaledPatch(160 + widthbar/2 - bombxoff, ybar - 7, FRACUNIT, W_CachePatchName("SPBMMAP", PU_CACHE));
} }
} }

7
src/menus/play-local-race-time-attack.c
View file

@ -10,7 +10,12 @@
#include "../m_misc.h" // M_MkdirEach #include "../m_misc.h" // M_MkdirEach
#include "../z_zone.h" // Z_StrDup/Z_Free #include "../z_zone.h" // Z_StrDup/Z_Free
consvar_t cv_dummyspbattack = CVAR_INIT ("dummyspbattack", "Off", CV_HIDDEN, CV_OnOff, NULL); static void CV_SPBAttackChanged(void)
{
G_UpdateTimeStickerMedals(levellist.choosemap, false);
}
consvar_t cv_dummyspbattack = CVAR_INIT ("dummyspbattack", "Off", CV_HIDDEN|CV_CALL, CV_OnOff, CV_SPBAttackChanged);
// see ta_e // see ta_e
menuitem_t PLAY_TimeAttack[] = menuitem_t PLAY_TimeAttack[] =

6
src/p_spec.c
View file

@ -1973,10 +1973,10 @@ static void K_HandleLapIncrement(player_t *player)
rainbowstartavailable = false; rainbowstartavailable = false;
} }
if (player->laps == 1 && modeattacking & ATTACKING_SPB && false) if (player->laps == 1 && modeattacking & ATTACKING_SPB)
{ {
P_SpawnMobj(player->mo->x - FixedMul(8000*mapobjectscale, cos(player->mo->angle)), P_SpawnMobj(player->mo->x - FixedMul(1000*mapobjectscale, FINECOSINE(player->mo->angle >> ANGLETOFINESHIFT)),
player->mo->y - FixedMul(8000*mapobjectscale, sin(player->mo->angle)), player->mo->y - FixedMul(1000*mapobjectscale, FINESINE(player->mo->angle >> ANGLETOFINESHIFT)),
player->mo->z, MT_SPB); player->mo->z, MT_SPB);
} }