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

Minor fixes, mostly mobjscale and spectators

This commit is contained in:
TehRealSalt 2018-02-10 16:19:22 -05:00
parent 4348be7d80
commit dbc664d4e7
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/g_game.c
View File

@ -2491,7 +2491,7 @@ void G_PlayerReborn(INT32 player)
} }
} }
if (leveltime > 157) if (leveltime > 157 && !p->spectator)
p->kartstuff[k_lakitu] = 48; // Lakitu Spawner p->kartstuff[k_lakitu] = 48; // Lakitu Spawner
if (gametype == GT_COOP) if (gametype == GT_COOP)

4
src/k_kart.c
View File

@ -946,9 +946,9 @@ void K_LakituChecker(player_t *player)
newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 0); newx = player->mo->x + P_ReturnThrustX(player->mo, newangle, 0);
newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 0); newy = player->mo->y + P_ReturnThrustY(player->mo, newangle, 0);
if (player->mo->eflags & MFE_VERTICALFLIP) if (player->mo->eflags & MFE_VERTICALFLIP)
newz = player->mo->z - 128*FRACUNIT; newz = player->mo->z - 128*(mapheaderinfo[gamemap-1]->mobj_scale);
else else
newz = player->mo->z + 64*FRACUNIT; newz = player->mo->z + 64*(mapheaderinfo[gamemap-1]->mobj_scale);
mo = P_SpawnMobj(newx, newy, newz, MT_LAKITU); mo = P_SpawnMobj(newx, newy, newz, MT_LAKITU);
if (mo) if (mo)
{ {

4
src/p_user.c
View File

@ -9257,7 +9257,7 @@ void P_PlayerThink(player_t *player)
// Check if all the players in the race have finished. If so, end the level. // Check if all the players in the race have finished. If so, end the level.
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (playeringame[i]) if (playeringame[i] && !players[i].spectator)
{ {
if (!players[i].exiting && players[i].lives > 0) if (!players[i].exiting && players[i].lives > 0)
break; break;
@ -9279,7 +9279,7 @@ void P_PlayerThink(player_t *player)
// If you've hit the countdown and you haven't made // If you've hit the countdown and you haven't made
// it to the exit, you're a goner! // it to the exit, you're a goner!
else */ else */
if (countdown == 1 && !player->exiting && player->lives > 0) if (countdown == 1 && !player->exiting && !player->spectator && player->lives > 0)
{ {
if (netgame && player->health > 0) if (netgame && player->health > 0)
CONS_Printf(M_GetText("%s ran out of time.\n"), player_names[player-players]); CONS_Printf(M_GetText("%s ran out of time.\n"), player_names[player-players]);