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

Merge branch 'specs_of_dust' into 'master'

Browse source 
Specs of dust

See merge request KartKrew/Kart!50
This commit is contained in:
Sal 2018-10-19 15:50:58 -04:00
parent 22aa01b35e 9db5e6a330
commit 27a4cbd52d
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_kart.c
View file

@ -5478,7 +5478,7 @@ void K_CheckSpectateStatus(void)
return; return;
if (numingame < 2 || leveltime < starttime || mapreset) // Allow if the match hasn't started yet if (numingame < 2 || leveltime < starttime || mapreset) // Allow if the match hasn't started yet
continue; continue;
if (leveltime > 20*TICRATE) // DON'T allow if the match is 20 seconds in if (leveltime > (starttime + 20*TICRATE)) // DON'T allow if the match is 20 seconds in
return; return;
if (G_RaceGametype() && players[i].laps) // DON'T allow if the race is at 2 laps if (G_RaceGametype() && players[i].laps) // DON'T allow if the race is at 2 laps
return; return;

2
src/p_user.c
View file

@ -9148,7 +9148,7 @@ void P_PlayerThink(player_t *player)
if ((netgame || splitscreen) && player->spectator && cmd->buttons & BT_ATTACK && !player->powers[pw_flashing]) if ((netgame || splitscreen) && player->spectator && cmd->buttons & BT_ATTACK && !player->powers[pw_flashing])
{ {
player->pflags ^= PF_WANTSTOJOIN; player->pflags ^= PF_WANTSTOJOIN;
//player->powers[pw_flashing] = TICRATE + 1; player->powers[pw_flashing] = TICRATE/2 + 1;
/*if (P_SpectatorJoinGame(player)) /*if (P_SpectatorJoinGame(player))
return; // player->mo was removed.*/ return; // player->mo was removed.*/
} }

4
src/st_stuff.c
View file

@ -1953,7 +1953,9 @@ static void ST_overlayDrawer(void)
{ {
// SRB2kart: changed positions & text // SRB2kart: changed positions & text
V_DrawString(2, BASEVIDHEIGHT-40, V_HUDTRANSHALF|V_YELLOWMAP, M_GetText("- SPECTATING -")); V_DrawString(2, BASEVIDHEIGHT-40, V_HUDTRANSHALF|V_YELLOWMAP, M_GetText("- SPECTATING -"));
if (stplyr->pflags & PF_WANTSTOJOIN) if (stplyr->powers[pw_flashing])
V_DrawString(2, BASEVIDHEIGHT-30, V_HUDTRANSHALF, M_GetText("Item - . . ."));
else if (stplyr->pflags & PF_WANTSTOJOIN)
V_DrawString(2, BASEVIDHEIGHT-30, V_HUDTRANSHALF, M_GetText("Item - Cancel Join")); V_DrawString(2, BASEVIDHEIGHT-30, V_HUDTRANSHALF, M_GetText("Item - Cancel Join"));
/*else if (G_GametypeHasTeams()) /*else if (G_GametypeHasTeams())
V_DrawString(2, BASEVIDHEIGHT-30, V_HUDTRANSHALF, M_GetText("Item - Join Team"));*/ V_DrawString(2, BASEVIDHEIGHT-30, V_HUDTRANSHALF, M_GetText("Item - Join Team"));*/