vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Minor across-board bugfixes re the past 24 hours of commits.

Browse source 
* d_main.c - fix the wipedef for skipping to the titlescreen to be the checkered one again.
* k_kart.c - Tweak drawtime's setting slightly.
* y_inter.c - Make endtic ALWAYS set when not netgame/splitscreen, to prevent an undesirable, possible hang whenever we add more stuff later.
This commit is contained in:
toaster 2018-07-19 14:59:38 +01:00
parent 1aa6267665
commit 37bf55543f
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.c
View file

@ -297,7 +297,7 @@ static void D_Display(void)
// set for all later // set for all later
wipedefindex = gamestate; // wipe_xxx_toblack wipedefindex = gamestate; // wipe_xxx_toblack
if (gamestate == GS_TITLESCREEN && wipegamestate != GS_INTRO) if (gamestate == GS_TITLESCREEN && wipegamestate != GS_INTRO)
wipedefindex = wipe_multinter_toblack; wipedefindex = wipe_timeattack_toblack;
else if (gamestate == GS_INTERMISSION) else if (gamestate == GS_INTERMISSION)
{ {
if (intertype == int_spec) // Special Stage if (intertype == int_spec) // Special Stage

2
src/k_kart.c
View file

@ -4590,7 +4590,7 @@ static void K_drawKartTimestamp(void)
if (cv_timelimit.value && timelimitintics > 0) if (cv_timelimit.value && timelimitintics > 0)
{ {
if (drawtime > timelimitintics) if (drawtime >= timelimitintics)
drawtime = 0; drawtime = 0;
else else
drawtime = timelimitintics - drawtime; drawtime = timelimitintics - drawtime;

6
src/y_inter.c
View file

@ -537,9 +537,7 @@ void Y_Ticker(void)
if (intertype == int_race || intertype == int_match) if (intertype == int_race || intertype == int_match)
{ {
if (modeattacking) if (netgame || multiplayer)
endtic = intertic + 8*TICRATE; // 8 second pause after end of tally
else if (netgame || multiplayer)
{ {
if (sorttic == -1) if (sorttic == -1)
sorttic = intertic + max((cv_inttime.value/2)-2, 2)*TICRATE; // 8 second pause after match results sorttic = intertic + max((cv_inttime.value/2)-2, 2)*TICRATE; // 8 second pause after match results
@ -573,6 +571,8 @@ void Y_Ticker(void)
} }
} }
} }
else
endtic = intertic + 8*TICRATE; // 8 second pause after end of tally
} }
} }