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

okay THIS time i actually made sure it compiled

This commit is contained in:
TehRealSalt 2017-11-30 18:25:59 -05:00
parent e430a3bced
commit 73217690ab
4 changed files with 66 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/d_player.h
View File

@ -275,7 +275,8 @@ typedef enum
k_squishedtimer, // Squished frame timer
k_goldshroomtimer, // Gold Mushroom duration timer
k_startimer, // Invincibility timer
k_spinouttimer, // Wipe-out from a banana peel or oil slick (was "pw_bananacam")
k_spinouttimer, // Spin-out from a banana peel or oil slick (was "pw_bananacam")
//k_wipeouttimer, // Wipe-out from a shell, waits a short amount of time before making you stop and spinning out in place
k_laserwisptimer, // The duration and relative angle of the laser
k_justbumped, // Prevent players from endlessly bumping into each other
k_poweritemtimer, // Battle mode, how long before you're allowed another power item (Star, Megashroom)

77
src/k_kart.c
View File

@ -1455,6 +1455,17 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->kartstuff[k_spinout] == 0 && player->kartstuff[k_spinouttimer] == 0 && player->powers[pw_flashing] == K_GetKartFlashing(player))
player->powers[pw_flashing]--;
/*if (player->kartstuff[k_wipeouttimer])
{
if (player->kartstuff[k_wipeouttimer] == 1)
{
player->kartstuff[k_spinouttype] = 1;
K_SpinPlayer(player, NULL);
player->mo->momx = player->mo->momy = 0;
}
player->kartstuff[k_wipeouttimer]--;
}*/
if (player->kartstuff[k_magnettimer])
player->kartstuff[k_magnettimer]--;
@ -1806,6 +1817,9 @@ void K_SpinPlayer(player_t *player, mobj_t *source)
if (gametype != GT_RACE)
{
if (source && source->player && player != source->player)
P_AddPlayerScore(source->player, 1);
if (player->kartstuff[k_balloon] > 0)
{
if (player->kartstuff[k_balloon] == 1)
@ -1813,9 +1827,6 @@ void K_SpinPlayer(player_t *player, mobj_t *source)
player->kartstuff[k_balloon]--;
}
if (source && source->player && player != source->player)
P_AddPlayerScore(source->player, 1);
K_CheckBalloons();
}
@ -1849,6 +1860,42 @@ void K_SpinPlayer(player_t *player, mobj_t *source)
return;
}
/*void K_WipeoutPlayer(player_t *player, mobj_t *source)
{
if (player->health <= 0)
return;
if (player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || (player->kartstuff[k_spinouttimer] > 0 && player->kartstuff[k_spinout] > 0)
|| player->kartstuff[k_startimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_bootimer] > 0
|| (gametype != GT_RACE && ((player->kartstuff[k_balloon] <= 0 && player->kartstuff[k_comebacktimer]) || player->kartstuff[k_comebackmode] == 1)))
return;
if (source && source != player->mo && source->player && !source->player->kartstuff[k_sounds])
{
S_StartSound(source, sfx_hitem);
source->player->kartstuff[k_sounds] = 50;
}
if (gametype != GT_RACE)
{
if (source && source->player && player != source->player)
P_AddPlayerScore(source->player, 1);
}
P_RingDamage(player, NULL, source, player->mo->health-1);
P_PlayerRingBurst(player, 5);
if (P_IsLocalPlayer(player))
{
quake.intensity = 32*FRACUNIT;
quake.time = 5;
}
player->kartstuff[k_wipeouttimer] = 21;
return;
}*/
void K_SquishPlayer(player_t *player, mobj_t *source)
{
if (player->health <= 0)
@ -1864,6 +1911,9 @@ void K_SquishPlayer(player_t *player, mobj_t *source)
if (gametype != GT_RACE)
{
if (source && source->player && player != source->player)
P_AddPlayerScore(source->player, 1);
if (player->kartstuff[k_balloon] > 0)
{
if (player->kartstuff[k_balloon] == 1)
@ -1871,9 +1921,6 @@ void K_SquishPlayer(player_t *player, mobj_t *source)
player->kartstuff[k_balloon]--;
}
if (source && source->player && player != source->player)
P_AddPlayerScore(source->player, 1);
K_CheckBalloons();
}
@ -1911,25 +1958,25 @@ void K_ExplodePlayer(player_t *player, mobj_t *source) // A bit of a hack, we ju
if (gametype != GT_RACE)
{
if (player->kartstuff[k_balloon] > 0)
{
if (player->kartstuff[k_balloon] == 1)
CONS_Printf(M_GetText("%s lost all of their balloons!\n"), player_names[player-players]);
player->kartstuff[k_balloon]--;
}
if (source && source->player && player != source->player)
{
if (source->player->kartstuff[k_balloon] <= 0)
{
source->player->kartstuff[k_comebackpoints] += 2;
CONS_Printf(M_GetText("%s bombed %s!\n"), player_names[source->player-players], player_names[player-players]);
if (thing->player->kartstuff[k_comebackpoints] >= 3)
K_StealBalloon(thing->player, tmthing->player, true);
if (source->player->kartstuff[k_comebackpoints] >= 3)
K_StealBalloon(source->player, player, true);
}
P_AddPlayerScore(source->player, 1);
}
if (player->kartstuff[k_balloon] > 0)
{
if (player->kartstuff[k_balloon] == 1)
CONS_Printf(M_GetText("%s lost all of their balloons!\n"), player_names[player-players]);
player->kartstuff[k_balloon]--;
}
K_CheckBalloons();
}

1
src/k_kart.h
View File

@ -21,6 +21,7 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce);
void K_KartMoveAnimation(player_t *player);
void K_KartPlayerThink(player_t *player, ticcmd_t *cmd);
void K_SpinPlayer(player_t *player, mobj_t *source);
//void K_WipeoutPlayer(player_t *player, mobj_t *source);
void K_SquishPlayer(player_t *player, mobj_t *source);
void K_ExplodePlayer(player_t *player, mobj_t *source);
void K_StealBalloon(player_t *player, player_t *victim, boolean force);

1
src/p_inter.c
View File

@ -3201,6 +3201,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|| inflictor->type == MT_TRIPLEREDSHIELD1 || inflictor->type == MT_TRIPLEREDSHIELD2 || inflictor->type == MT_TRIPLEREDSHIELD3
|| inflictor->player))
{
//K_WipeoutPlayer(player, source);
player->kartstuff[k_spinouttype] = 1;
K_SpinPlayer(player, source);
damage = player->mo->health - 1;