stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-17 02:01:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

More tweaks to cards

Browse source
This commit is contained in:
TehRealSalt 2017-11-29 02:07:22 -05:00
parent c3ca835284
commit 2f23ff466c
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/k_kart.c
View file

@ -1510,16 +1510,12 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->kartstuff[k_lapanimation]) if (player->kartstuff[k_lapanimation])
player->kartstuff[k_lapanimation]--; player->kartstuff[k_lapanimation]--;
if (gametype != GT_RACE) if (gametype != GT_RACE && (player->exiting || (player->kartstuff[k_balloon] <= 0 && player->kartstuff[k_comebacktimer])))
{ {
INT32 timer = player->kartstuff[k_comebacktimer]; if ((player->exiting < 6*TICRATE)
|| (player->kartstuff[k_comebacktimer] > 7*TICRATE && player->kartstuff[k_comebacktimer] < 9*TICRATE))
if (player->exiting > 0)
timer = player->exiting;
if (timer > 7*TICRATE && timer < 9*TICRATE)
player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1; player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1;
else if (timer < 5*TICRATE) else if (player->kartstuff[k_comebacktimer] < 5*TICRATE && !player->exiting)
player->kartstuff[k_cardanimation] -= ((164-player->kartstuff[k_cardanimation])/8)+1; player->kartstuff[k_cardanimation] -= ((164-player->kartstuff[k_cardanimation])/8)+1;
if (player->kartstuff[k_cardanimation] > 164) if (player->kartstuff[k_cardanimation] > 164)
@ -1527,6 +1523,8 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->kartstuff[k_cardanimation] < 0) if (player->kartstuff[k_cardanimation] < 0)
player->kartstuff[k_cardanimation] = 0; player->kartstuff[k_cardanimation] = 0;
} }
else
player->kartstuff[k_cardanimation] = 0;
if (player->kartstuff[k_sounds]) if (player->kartstuff[k_sounds])
player->kartstuff[k_sounds]--; player->kartstuff[k_sounds]--;
@ -4749,15 +4747,24 @@ static void K_drawKartPlayerCheck(void)
static void K_drawBattleFullscreen(void) static void K_drawBattleFullscreen(void)
{ {
INT32 y = STRINGY(-64+(stplyr->kartstuff[k_cardanimation])); // card animation goes from 0 to 164, 164 is the middle of the screen INT32 y = -64+(stplyr->kartstuff[k_cardanimation]); // card animation goes from 0 to 164, 164 is the middle of the screen
if (!splitscreen) if (splitscreen)
{
if (stplyr != &players[displayplayer])
y = 232-(stplyr->kartstuff[k_cardanimation]/2);
else
y = -32+(stplyr->kartstuff[k_cardanimation]/2);
}
else
V_DrawFadeScreen(); V_DrawFadeScreen();
if (stplyr->exiting) if (stplyr->exiting)
{ {
if (splitscreen) if (splitscreen)
{ {
if (stplyr == &players[displayplayer])
V_DrawFadeScreen();
if (stplyr->kartstuff[k_balloon]) if (stplyr->kartstuff[k_balloon])
V_DrawScaledPatch(96, y, 0, kp_battlewin); V_DrawScaledPatch(96, y, 0, kp_battlewin);
else else
@ -4782,19 +4789,14 @@ static void K_drawBattleFullscreen(void)
t /= 10; t /= 10;
} }
if (!stplyr->kartstuff[k_comebackshowninfo]) if (!stplyr->kartstuff[k_comebackshowninfo] && !splitscreen)
{
V_DrawScaledPatch(BASEVIDWIDTH/2, y, 0, kp_battleinfo); V_DrawScaledPatch(BASEVIDWIDTH/2, y, 0, kp_battleinfo);
else
V_DrawScaledPatch(BASEVIDWIDTH/2, y, 0, kp_battlewait);
V_DrawScaledPatch(BASEVIDWIDTH/2, STRINGY((BASEVIDHEIGHT/2) + 66), 0, kp_timeoutsticker); V_DrawScaledPatch(BASEVIDWIDTH/2, STRINGY((BASEVIDHEIGHT/2) + 66), 0, kp_timeoutsticker);
V_DrawKartString(x, STRINGY((BASEVIDHEIGHT/2) + 66), 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE)); V_DrawKartString(x, STRINGY((BASEVIDHEIGHT/2) + 66), 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
} }
else
{
V_DrawScaledPatch(BASEVIDWIDTH/2, y, 0, kp_battlewait);
V_DrawScaledPatch(BASEVIDWIDTH/2, STRINGY((BASEVIDHEIGHT/2) + 30), 0, kp_timeoutsticker);
V_DrawKartString(x, STRINGY((BASEVIDHEIGHT/2) + 30), 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
}
}
} }
static void K_drawStartLakitu(void) static void K_drawStartLakitu(void)

2
src/p_user.c
View file

@ -1681,7 +1681,7 @@ void P_DoPlayerExit(player_t *player)
player->exiting = (14*TICRATE)/5 + 1; player->exiting = (14*TICRATE)/5 + 1;
} }
else if (gametype != GT_RACE) else if (gametype != GT_RACE)
player->exiting = 10*TICRATE + 1; // Battle Mode exiting player->exiting = 8*TICRATE + 1; // Battle Mode exiting
else else
player->exiting = (14*TICRATE)/5 + 2; // Accidental death safeguard??? player->exiting = (14*TICRATE)/5 + 2; // Accidental death safeguard???