thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add an array for unsynced, HUD animation variables

Browse source 
Reduces the size of kartstuff_t, and makes it easy to add even more HUD animations. Fixes viewpoints being wonky for rings.
This commit is contained in:
TehRealSalt 2019-05-12 14:33:18 -04:00
parent 7884f63849
commit 933ca5c3a4
7 changed files with 201 additions and 190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/d_player.h
View file

@ -235,6 +235,7 @@ typedef enum
//{ SRB2kart - kartstuff //{ SRB2kart - kartstuff
typedef enum typedef enum
{ {
// TODO: Kill this giant array. Add them as actual player_t variables, or condense related timers into their own, smaller arrays.
// Basic gameplay things // Basic gameplay things
k_position, // Used for Kart positions, mostly for deterministic stuff k_position, // Used for Kart positions, mostly for deterministic stuff
k_oldposition, // Used for taunting when you pass someone k_oldposition, // Used for taunting when you pass someone
@ -248,13 +249,7 @@ typedef enum
k_dropdash, // Charge up for respawn Drop Dash k_dropdash, // Charge up for respawn Drop Dash
k_throwdir, // Held dir of controls; 1 = forward, 0 = none, -1 = backward (was "player->heldDir") k_throwdir, // Held dir of controls; 1 = forward, 0 = none, -1 = backward (was "player->heldDir")
k_lapanimation, // Used to show the lap start wing logo animation
k_laphand, // Lap hand gfx to use; 0 = none, 1 = :ok_hand:, 2 = :thumbs_up:, 3 = :thumps_down:
k_cardanimation, // Used to determine the position of some full-screen Battle Mode graphics
k_voices, // Used to stop the player saying more voices than it should
k_tauntvoices, // Used to specifically stop taunt voice spam
k_instashield, // Instashield no-damage animation timer k_instashield, // Instashield no-damage animation timer
k_enginesnd, // Engine sound number you're on.
k_floorboost, // Prevents Sneaker sounds for a breif duration when triggered by a floor panel k_floorboost, // Prevents Sneaker sounds for a breif duration when triggered by a floor panel
k_spinouttype, // Determines whether to thrust forward or not while spinning out; 0 = move forwards, 1 = stay still, 2 = stay still & no flashing tics k_spinouttype, // Determines whether to thrust forward or not while spinning out; 0 = move forwards, 1 = stay still, 2 = stay still & no flashing tics
@ -284,9 +279,6 @@ typedef enum
k_draftpower, // Drafting power (from 0 to FRACUNIT), doubles your top speed & acceleration at max k_draftpower, // Drafting power (from 0 to FRACUNIT), doubles your top speed & acceleration at max
k_draftleeway, // Leniency timer before removing draft power k_draftleeway, // Leniency timer before removing draft power
k_lastdraft, // Last player being drafted k_lastdraft, // Last player being drafted
k_boostcam, // Camera push forward on boost
k_destboostcam, // Ditto
k_timeovercam, // Camera timer for leaving behind or not
k_aizdriftstrat, // Let go of your drift while boosting? Helper for the SICK STRATZ you have just unlocked k_aizdriftstrat, // Let go of your drift while boosting? Helper for the SICK STRATZ you have just unlocked
k_brakedrift, // Helper for brake-drift spark spawning k_brakedrift, // Helper for brake-drift spark spawning
@ -327,11 +319,8 @@ typedef enum
k_comebackpoints, // Number of times you've bombed or gave an item to someone; once it's 3 it gets set back to 0 and you're given a bumper k_comebackpoints, // Number of times you've bombed or gave an item to someone; once it's 3 it gets set back to 0 and you're given a bumper
k_comebackmode, // 0 = bomb, 1 = item k_comebackmode, // 0 = bomb, 1 = item
k_wanted, // Timer for determining WANTED status, lowers when hitting people, prevents the game turning into Camp Lazlo k_wanted, // Timer for determining WANTED status, lowers when hitting people, prevents the game turning into Camp Lazlo
k_yougotem, // "You Got Em" gfx when hitting someone as a karma player via a method that gets you back in the game instantly
// v1.0.2+ vars // v1.0.2+ vars
k_itemblink, // Item flashing after roulette, prevents Hyudoro stealing AND serves as a mashing indicator
k_itemblinkmode, // Type of flashing: 0 = white (normal), 1 = red (mashing), 2 = rainbow (enhanced items)
k_getsparks, // Disable drift sparks at low speed, JUST enough to give acceleration the actual headstart above speed k_getsparks, // Disable drift sparks at low speed, JUST enough to give acceleration the actual headstart above speed
k_jawztargetdelay, // Delay for Jawz target switching, to make it less twitchy k_jawztargetdelay, // Delay for Jawz target switching, to make it less twitchy
k_spectatewait, // How long have you been waiting as a spectator k_spectatewait, // How long have you been waiting as a spectator
@ -340,6 +329,40 @@ typedef enum
NUMKARTSTUFF NUMKARTSTUFF
} kartstufftype_t; } kartstufftype_t;
typedef enum
{
// Unsynced, HUD or clientsided effects
// Item box
khud_itemblink, // Item flashing after roulette, prevents Hyudoro stealing AND serves as a mashing indicator
khud_itemblinkmode, // Type of flashing: 0 = white (normal), 1 = red (mashing), 2 = rainbow (enhanced items)
// Rings
khud_ringframe, // Ring spin frame
khud_ringtics, // Tics left until next ring frame
khud_ringdelay, // Next frame's tics
khud_ringspblock, // Which frame of the SPB ring lock animation to use
// Lap finish
khud_lapanimation, // Used to show the lap start wing logo animation
khud_laphand, // Lap hand gfx to use; 0 = none, 1 = :ok_hand:, 2 = :thumbs_up:, 3 = :thumps_down:
// Camera
khud_boostcam, // Camera push forward on boost
khud_destboostcam, // Ditto
khud_timeovercam, // Camera timer for leaving behind or not
// Sounds
khud_enginesnd, // Engine sound offset this player is using.
khud_voices, // Used to stop the player saying more voices than it should
khud_tauntvoices, // Used to specifically stop taunt voice spam
// Battle
khud_cardanimation, // Used to determine the position of some full-screen Battle Mode graphics
khud_yougotem, // "You Got Em" gfx when hitting someone as a karma player via a method that gets you back in the game instantly
NUMKARTHUD
} karthudtype_t;
// QUICKLY GET EITHER SNEAKER OR LEVEL BOOSTER SINCE THEY ARE FUNCTIONALLY IDENTICAL // QUICKLY GET EITHER SNEAKER OR LEVEL BOOSTER SINCE THEY ARE FUNCTIONALLY IDENTICAL
#define EITHERSNEAKER(p) (p->kartstuff[k_sneakertimer] || p->kartstuff[k_levelbooster]) #define EITHERSNEAKER(p) (p->kartstuff[k_sneakertimer] || p->kartstuff[k_levelbooster])
@ -403,6 +426,7 @@ typedef struct player_s
// SRB2kart stuff // SRB2kart stuff
INT32 kartstuff[NUMKARTSTUFF]; INT32 kartstuff[NUMKARTSTUFF];
INT32 karthud[NUMKARTHUD];
angle_t frameangle; // for the player add the ability to have the sprite only face other angles angle_t frameangle; // for the player add the ability to have the sprite only face other angles
INT16 lturn_max[MAXPREDICTTICS]; // What's the expected turn value for full-left for a number of frames back (to account for netgame latency)? INT16 lturn_max[MAXPREDICTTICS]; // What's the expected turn value for full-left for a number of frames back (to account for netgame latency)?
INT16 rturn_max[MAXPREDICTTICS]; // Ditto but for full-right INT16 rturn_max[MAXPREDICTTICS]; // Ditto but for full-right

12
src/dehacked.c
View file

@ -8390,13 +8390,7 @@ static const char *const KARTSTUFF_LIST[] = {
"DROPDASH", "DROPDASH",
"THROWDIR", "THROWDIR",
"LAPANIMATION",
"LAPHAND",
"CARDANIMATION",
"VOICES",
"TAUNTVOICES",
"INSTASHIELD", "INSTASHIELD",
"ENGINESND",
"FLOORBOOST", "FLOORBOOST",
"SPINOUTTYPE", "SPINOUTTYPE",
@ -8426,9 +8420,6 @@ static const char *const KARTSTUFF_LIST[] = {
"DRAFTPOWER", "DRAFTPOWER",
"DRAFTLEEWAY", "DRAFTLEEWAY",
"LASTDRAFT", "LASTDRAFT",
"BOOSTCAM",
"DESTBOOSTCAM",
"TIMEOVERCAM",
"AIZDRIFTSTRAT", "AIZDRIFTSTRAT",
"BRAKEDRIFT", "BRAKEDRIFT",
@ -8465,10 +8456,7 @@ static const char *const KARTSTUFF_LIST[] = {
"COMEBACKPOINTS", "COMEBACKPOINTS",
"COMEBACKMODE", "COMEBACKMODE",
"WANTED", "WANTED",
"YOUGOTEM",
"ITEMBLINK",
"ITEMBLINKMODE",
"GETSPARKS", "GETSPARKS",
"JAWZTARGETDELAY", "JAWZTARGETDELAY",
"SPECTATEWAIT", "SPECTATEWAIT",

299
src/k_kart.c
View file

@ -1109,8 +1109,8 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
if (player->kartstuff[k_roulettetype] == 2) if (player->kartstuff[k_roulettetype] == 2)
{ {
player->kartstuff[k_eggmanexplode] = 4*TICRATE; player->kartstuff[k_eggmanexplode] = 4*TICRATE;
//player->kartstuff[k_itemblink] = TICRATE; //player->karthud[khud_itemblink] = TICRATE;
//player->kartstuff[k_itemblinkmode] = 1; //player->karthud[khud_itemblinkmode] = 1;
player->kartstuff[k_itemroulette] = 0; player->kartstuff[k_itemroulette] = 0;
player->kartstuff[k_roulettetype] = 0; player->kartstuff[k_roulettetype] = 0;
if (P_IsDisplayPlayer(player)) if (P_IsDisplayPlayer(player))
@ -1124,8 +1124,8 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
{ {
K_KartGetItemResult(player, cv_kartdebugitem.value); K_KartGetItemResult(player, cv_kartdebugitem.value);
player->kartstuff[k_itemamount] = cv_kartdebugamount.value; player->kartstuff[k_itemamount] = cv_kartdebugamount.value;
player->kartstuff[k_itemblink] = TICRATE; player->karthud[khud_itemblink] = TICRATE;
player->kartstuff[k_itemblinkmode] = 2; player->karthud[khud_itemblinkmode] = 2;
player->kartstuff[k_itemroulette] = 0; player->kartstuff[k_itemroulette] = 0;
player->kartstuff[k_roulettetype] = 0; player->kartstuff[k_roulettetype] = 0;
if (P_IsDisplayPlayer(player)) if (P_IsDisplayPlayer(player))
@ -1142,7 +1142,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
if (mashed && (modeattacking || cv_superring.value)) // ANY mashed value? You get rings. if (mashed && (modeattacking || cv_superring.value)) // ANY mashed value? You get rings.
{ {
K_KartGetItemResult(player, KITEM_SUPERRING); K_KartGetItemResult(player, KITEM_SUPERRING);
player->kartstuff[k_itemblinkmode] = 1; player->karthud[khud_itemblinkmode] = 1;
if (P_IsDisplayPlayer(player)) if (P_IsDisplayPlayer(player))
S_StartSound(NULL, sfx_itrolm); S_StartSound(NULL, sfx_itrolm);
} }
@ -1152,7 +1152,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
K_KartGetItemResult(player, KITEM_SNEAKER); K_KartGetItemResult(player, KITEM_SNEAKER);
else // Default to sad if nothing's enabled... else // Default to sad if nothing's enabled...
K_KartGetItemResult(player, KITEM_SAD); K_KartGetItemResult(player, KITEM_SAD);
player->kartstuff[k_itemblinkmode] = 0; player->karthud[khud_itemblinkmode] = 0;
if (P_IsDisplayPlayer(player)) if (P_IsDisplayPlayer(player))
S_StartSound(NULL, sfx_itrolf); S_StartSound(NULL, sfx_itrolf);
} }
@ -1162,7 +1162,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
if (mashed && (modeattacking || cv_banana.value)) // ANY mashed value? You get a banana. if (mashed && (modeattacking || cv_banana.value)) // ANY mashed value? You get a banana.
{ {
K_KartGetItemResult(player, KITEM_BANANA); K_KartGetItemResult(player, KITEM_BANANA);
player->kartstuff[k_itemblinkmode] = 1; player->karthud[khud_itemblinkmode] = 1;
if (P_IsDisplayPlayer(player)) if (P_IsDisplayPlayer(player))
S_StartSound(NULL, sfx_itrolm); S_StartSound(NULL, sfx_itrolm);
} }
@ -1172,13 +1172,13 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
K_KartGetItemResult(player, KITEM_ORBINAUT); K_KartGetItemResult(player, KITEM_ORBINAUT);
else // Default to sad if nothing's enabled... else // Default to sad if nothing's enabled...
K_KartGetItemResult(player, KITEM_SAD); K_KartGetItemResult(player, KITEM_SAD);
player->kartstuff[k_itemblinkmode] = 0; player->karthud[khud_itemblinkmode] = 0;
if (P_IsDisplayPlayer(player)) if (P_IsDisplayPlayer(player))
S_StartSound(NULL, sfx_itrolf); S_StartSound(NULL, sfx_itrolf);
} }
} }
player->kartstuff[k_itemblink] = TICRATE; player->karthud[khud_itemblink] = TICRATE;
player->kartstuff[k_itemroulette] = 0; player->kartstuff[k_itemroulette] = 0;
player->kartstuff[k_roulettetype] = 0; player->kartstuff[k_roulettetype] = 0;
return; return;
@ -1192,8 +1192,8 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
if (P_RandomChance((debtamount*FRACUNIT)/20)) if (P_RandomChance((debtamount*FRACUNIT)/20))
{ {
K_KartGetItemResult(player, KITEM_SUPERRING); K_KartGetItemResult(player, KITEM_SUPERRING);
player->kartstuff[k_itemblink] = TICRATE; player->karthud[khud_itemblink] = TICRATE;
player->kartstuff[k_itemblinkmode] = 1; player->karthud[khud_itemblinkmode] = 1;
player->kartstuff[k_itemroulette] = 0; player->kartstuff[k_itemroulette] = 0;
player->kartstuff[k_roulettetype] = 0; player->kartstuff[k_roulettetype] = 0;
if (P_IsDisplayPlayer(player)) if (P_IsDisplayPlayer(player))
@ -1209,8 +1209,8 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
&& cv_selfpropelledbomb.value) && cv_selfpropelledbomb.value)
{ {
K_KartGetItemResult(player, KITEM_SPB); K_KartGetItemResult(player, KITEM_SPB);
player->kartstuff[k_itemblink] = TICRATE; player->karthud[khud_itemblink] = TICRATE;
player->kartstuff[k_itemblinkmode] = (mashed ? 1 : 0); player->karthud[khud_itemblinkmode] = (mashed ? 1 : 0);
player->kartstuff[k_itemroulette] = 0; player->kartstuff[k_itemroulette] = 0;
player->kartstuff[k_roulettetype] = 0; player->kartstuff[k_roulettetype] = 0;
if (P_IsDisplayPlayer(player)) if (P_IsDisplayPlayer(player))
@ -1246,8 +1246,8 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
if (P_IsDisplayPlayer(player)) if (P_IsDisplayPlayer(player))
S_StartSound(NULL, ((player->kartstuff[k_roulettetype] == 1) ? sfx_itrolk : (mashed ? sfx_itrolm : sfx_itrolf))); S_StartSound(NULL, ((player->kartstuff[k_roulettetype] == 1) ? sfx_itrolk : (mashed ? sfx_itrolm : sfx_itrolf)));
player->kartstuff[k_itemblink] = TICRATE; player->karthud[khud_itemblink] = TICRATE;
player->kartstuff[k_itemblinkmode] = ((player->kartstuff[k_roulettetype] == 1) ? 2 : (mashed ? 1 : 0)); player->karthud[khud_itemblinkmode] = ((player->kartstuff[k_roulettetype] == 1) ? 2 : (mashed ? 1 : 0));
player->kartstuff[k_itemroulette] = 0; // Since we're done, clear the roulette number player->kartstuff[k_itemroulette] = 0; // Since we're done, clear the roulette number
player->kartstuff[k_roulettetype] = 0; // This too player->kartstuff[k_roulettetype] = 0; // This too
@ -2075,8 +2075,8 @@ static void K_TauntVoiceTimers(player_t *player)
if (!player) if (!player)
return; return;
player->kartstuff[k_tauntvoices] = 6*TICRATE; player->karthud[khud_tauntvoices] = 6*TICRATE;
player->kartstuff[k_voices] = 4*TICRATE; player->karthud[khud_voices] = 4*TICRATE;
} }
static void K_RegularVoiceTimers(player_t *player) static void K_RegularVoiceTimers(player_t *player)
@ -2084,16 +2084,16 @@ static void K_RegularVoiceTimers(player_t *player)
if (!player) if (!player)
return; return;
player->kartstuff[k_voices] = 4*TICRATE; player->karthud[khud_voices] = 4*TICRATE;
if (player->kartstuff[k_tauntvoices] < 4*TICRATE) if (player->karthud[khud_tauntvoices] < 4*TICRATE)
player->kartstuff[k_tauntvoices] = 4*TICRATE; player->karthud[khud_tauntvoices] = 4*TICRATE;
} }
void K_PlayAttackTaunt(mobj_t *source) void K_PlayAttackTaunt(mobj_t *source)
{ {
sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons
boolean tasteful = (!source->player || !source->player->kartstuff[k_tauntvoices]); boolean tasteful = (!source->player || !source->player->karthud[khud_tauntvoices]);
if (cv_kartvoices.value && (tasteful || cv_kartvoices.value == 2)) if (cv_kartvoices.value && (tasteful || cv_kartvoices.value == 2))
S_StartSound(source, sfx_kattk1+pick); S_StartSound(source, sfx_kattk1+pick);
@ -2107,7 +2107,7 @@ void K_PlayAttackTaunt(mobj_t *source)
void K_PlayBoostTaunt(mobj_t *source) void K_PlayBoostTaunt(mobj_t *source)
{ {
sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons
boolean tasteful = (!source->player || !source->player->kartstuff[k_tauntvoices]); boolean tasteful = (!source->player || !source->player->karthud[khud_tauntvoices]);
if (cv_kartvoices.value && (tasteful || cv_kartvoices.value == 2)) if (cv_kartvoices.value && (tasteful || cv_kartvoices.value == 2))
S_StartSound(source, sfx_kbost1+pick); S_StartSound(source, sfx_kbost1+pick);
@ -2120,7 +2120,7 @@ void K_PlayBoostTaunt(mobj_t *source)
void K_PlayOvertakeSound(mobj_t *source) void K_PlayOvertakeSound(mobj_t *source)
{ {
boolean tasteful = (!source->player || !source->player->kartstuff[k_voices]); boolean tasteful = (!source->player || !source->player->karthud[khud_voices]);
if (!G_RaceGametype()) // Only in race if (!G_RaceGametype()) // Only in race
return; return;
@ -3872,7 +3872,7 @@ static void K_DoHyudoroSteal(player_t *player)
&& (players[i].kartstuff[k_itemtype] && (players[i].kartstuff[k_itemtype]
&& players[i].kartstuff[k_itemamount] && players[i].kartstuff[k_itemamount]
&& !players[i].kartstuff[k_itemheld] && !players[i].kartstuff[k_itemheld]
&& !players[i].kartstuff[k_itemblink])) && !players[i].karthud[khud_itemblink]))
{ {
playerswappable[numplayers] = i; playerswappable[numplayers] = i;
numplayers++; numplayers++;
@ -3935,7 +3935,7 @@ void K_DoSneaker(player_t *player, INT32 type)
S_StartSound(player->mo, sfx_cdfm01); S_StartSound(player->mo, sfx_cdfm01);
K_SpawnDashDustRelease(player); K_SpawnDashDustRelease(player);
if (intendedboost > player->kartstuff[k_speedboost]) if (intendedboost > player->kartstuff[k_speedboost])
player->kartstuff[k_destboostcam] = FixedMul(FRACUNIT, FixedDiv((intendedboost - player->kartstuff[k_speedboost]), intendedboost)); player->karthud[khud_destboostcam] = FixedMul(FRACUNIT, FixedDiv((intendedboost - player->kartstuff[k_speedboost]), intendedboost));
} }
if (!EITHERSNEAKER(player)) if (!EITHERSNEAKER(player))
@ -4740,7 +4740,7 @@ static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd)
// Silence the engines // Silence the engines
if (leveltime < 8 || player->spectator || player->exiting) if (leveltime < 8 || player->spectator || player->exiting)
{ {
player->kartstuff[k_enginesnd] = 0; // Reset sound number player->karthud[khud_enginesnd] = 0; // Reset sound number
return; return;
} }
@ -4761,15 +4761,15 @@ static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd)
if (targetsnd > 12) if (targetsnd > 12)
targetsnd = 12; targetsnd = 12;
if (player->kartstuff[k_enginesnd] < targetsnd) if (player->karthud[khud_enginesnd] < targetsnd)
player->kartstuff[k_enginesnd]++; player->karthud[khud_enginesnd]++;
if (player->kartstuff[k_enginesnd] > targetsnd) if (player->karthud[khud_enginesnd] > targetsnd)
player->kartstuff[k_enginesnd]--; player->karthud[khud_enginesnd]--;
if (player->kartstuff[k_enginesnd] < 0) if (player->karthud[khud_enginesnd] < 0)
player->kartstuff[k_enginesnd] = 0; player->karthud[khud_enginesnd] = 0;
if (player->kartstuff[k_enginesnd] > 12) if (player->karthud[khud_enginesnd] > 12)
player->kartstuff[k_enginesnd] = 12; player->karthud[khud_enginesnd] = 12;
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
@ -4809,7 +4809,7 @@ static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd)
if (volume <= 0) // Might as well if (volume <= 0) // Might as well
return; return;
S_StartSoundAtVolume(player->mo, (sfx_krta00 + player->kartstuff[k_enginesnd]) + (class*numsnds), volume); S_StartSoundAtVolume(player->mo, (sfx_krta00 + player->karthud[khud_enginesnd]) + (class*numsnds), volume);
} }
static void K_UpdateInvincibilitySounds(player_t *player) static void K_UpdateInvincibilitySounds(player_t *player)
@ -4847,47 +4847,111 @@ static void K_UpdateInvincibilitySounds(player_t *player)
#undef STOPTHIS #undef STOPTHIS
} }
#define RINGANIM_NUMFRAMES 10
#define RINGANIM_DELAYMAX 5
void K_KartPlayerHUDUpdate(player_t *player) void K_KartPlayerHUDUpdate(player_t *player)
{ {
if (player->kartstuff[k_lapanimation]) if (player->karthud[khud_lapanimation])
player->kartstuff[k_lapanimation]--; player->karthud[khud_lapanimation]--;
if (player->kartstuff[k_yougotem]) if (player->karthud[khud_yougotem])
player->kartstuff[k_yougotem]--; player->karthud[khud_yougotem]--;
if (player->karthud[khud_voices])
player->karthud[khud_voices]--;
if (player->karthud[khud_tauntvoices])
player->karthud[khud_tauntvoices]--;
if (G_RaceGametype())
{
// 0 is the fast spin animation, set at 30 tics of ring boost or higher!
if (player->kartstuff[k_ringboost] >= 30)
player->karthud[khud_ringdelay] = 0;
else
player->karthud[khud_ringdelay] = ((RINGANIM_DELAYMAX+1) * (30 - player->kartstuff[k_ringboost])) / 30;
if (player->karthud[khud_ringframe] == 0 && player->karthud[khud_ringdelay] > RINGANIM_DELAYMAX)
{
player->karthud[khud_ringframe] = 0;
player->karthud[khud_ringtics] = 0;
}
else if ((player->karthud[khud_ringtics]--) <= 0)
{
if (player->karthud[khud_ringdelay] == 0) // fast spin animation
{
player->karthud[khud_ringframe] = ((player->karthud[khud_ringframe]+2) % RINGANIM_NUMFRAMES);
player->karthud[khud_ringtics] = 0;
}
else
{
player->karthud[khud_ringframe] = ((player->karthud[khud_ringframe]+1) % RINGANIM_NUMFRAMES);
player->karthud[khud_ringtics] = min(RINGANIM_DELAYMAX, player->karthud[khud_ringdelay])-1;
}
}
if (player->kartstuff[k_ringlock])
{
UINT8 normalanim = (leveltime % 14);
UINT8 debtanim = 14 + (leveltime % 2);
if (player->karthud[khud_ringspblock] >= 14) // debt animation
{
if ((stplyr->kartstuff[k_rings] > 0) // Get out of 0 ring animation
&& (normalanim == 3 || normalanim == 10)) // on these transition frames.
player->karthud[khud_ringspblock] = normalanim;
else
player->karthud[khud_ringspblock] = debtanim;
}
else // normal animation
{
if ((stplyr->kartstuff[k_rings] <= 0) // Go into 0 ring animation
&& (player->karthud[khud_ringspblock] == 1 || player->karthud[khud_ringspblock] == 8)) // on these transition frames.
player->karthud[khud_ringspblock] = debtanim;
else
player->karthud[khud_ringspblock] = normalanim;
}
}
else
player->karthud[khud_ringspblock] = (leveltime % 14); // reset to normal anim next time
}
if (G_BattleGametype() && (player->exiting || player->kartstuff[k_comebacktimer])) if (G_BattleGametype() && (player->exiting || player->kartstuff[k_comebacktimer]))
{ {
if (player->exiting) if (player->exiting)
{ {
if (player->exiting < 6*TICRATE) if (player->exiting < 6*TICRATE)
player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1; player->karthud[khud_cardanimation] += ((164-player->karthud[khud_cardanimation])/8)+1;
else if (player->exiting == 6*TICRATE) else if (player->exiting == 6*TICRATE)
player->kartstuff[k_cardanimation] = 0; player->karthud[khud_cardanimation] = 0;
else if (player->kartstuff[k_cardanimation] < 2*TICRATE) else if (player->karthud[khud_cardanimation] < 2*TICRATE)
player->kartstuff[k_cardanimation]++; player->karthud[khud_cardanimation]++;
} }
else else
{ {
if (player->kartstuff[k_comebacktimer] < 6*TICRATE) if (player->kartstuff[k_comebacktimer] < 6*TICRATE)
player->kartstuff[k_cardanimation] -= ((164-player->kartstuff[k_cardanimation])/8)+1; player->karthud[khud_cardanimation] -= ((164-player->karthud[khud_cardanimation])/8)+1;
else if (player->kartstuff[k_comebacktimer] < 9*TICRATE) else if (player->kartstuff[k_comebacktimer] < 9*TICRATE)
player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1; player->karthud[khud_cardanimation] += ((164-player->karthud[khud_cardanimation])/8)+1;
} }
if (player->kartstuff[k_cardanimation] > 164) if (player->karthud[khud_cardanimation] > 164)
player->kartstuff[k_cardanimation] = 164; player->karthud[khud_cardanimation] = 164;
if (player->kartstuff[k_cardanimation] < 0) if (player->karthud[khud_cardanimation] < 0)
player->kartstuff[k_cardanimation] = 0; player->karthud[khud_cardanimation] = 0;
} }
else if (G_RaceGametype() && player->exiting) else if (G_RaceGametype() && player->exiting)
{ {
if (player->kartstuff[k_cardanimation] < 2*TICRATE) if (player->karthud[khud_cardanimation] < 2*TICRATE)
player->kartstuff[k_cardanimation]++; player->karthud[khud_cardanimation]++;
} }
else else
player->kartstuff[k_cardanimation] = 0; player->karthud[khud_cardanimation] = 0;
} }
#undef RINGANIM_DELAYMAX
/** \brief Decreases various kart timers and powers per frame. Called in P_PlayerThink in p_user.c /** \brief Decreases various kart timers and powers per frame. Called in P_PlayerThink in p_user.c
\param player player object passed from P_PlayerThink \param player player object passed from P_PlayerThink
@ -5038,25 +5102,25 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
} }
// DKR style camera for boosting // DKR style camera for boosting
if (player->kartstuff[k_boostcam] != 0 || player->kartstuff[k_destboostcam] != 0) if (player->karthud[khud_boostcam] != 0 || player->karthud[khud_destboostcam] != 0)
{ {
if (player->kartstuff[k_boostcam] < player->kartstuff[k_destboostcam] if (player->karthud[khud_boostcam] < player->karthud[khud_destboostcam]
&& player->kartstuff[k_destboostcam] != 0) && player->karthud[khud_destboostcam] != 0)
{ {
player->kartstuff[k_boostcam] += FRACUNIT/(TICRATE/4); player->karthud[khud_boostcam] += FRACUNIT/(TICRATE/4);
if (player->kartstuff[k_boostcam] >= player->kartstuff[k_destboostcam]) if (player->karthud[khud_boostcam] >= player->karthud[khud_destboostcam])
player->kartstuff[k_destboostcam] = 0; player->karthud[khud_destboostcam] = 0;
} }
else else
{ {
player->kartstuff[k_boostcam] -= FRACUNIT/TICRATE; player->karthud[khud_boostcam] -= FRACUNIT/TICRATE;
if (player->kartstuff[k_boostcam] < player->kartstuff[k_destboostcam]) if (player->karthud[khud_boostcam] < player->karthud[khud_destboostcam])
player->kartstuff[k_boostcam] = player->kartstuff[k_destboostcam] = 0; player->karthud[khud_boostcam] = player->karthud[khud_destboostcam] = 0;
} }
//CONS_Printf("cam: %d, dest: %d\n", player->kartstuff[k_boostcam], player->kartstuff[k_destboostcam]); //CONS_Printf("cam: %d, dest: %d\n", player->karthud[khud_boostcam], player->karthud[khud_destboostcam]);
} }
player->kartstuff[k_timeovercam] = 0; player->karthud[khud_timeovercam] = 0;
// Specific hack because it insists on setting flashing tics during this anyway... // Specific hack because it insists on setting flashing tics during this anyway...
if (player->kartstuff[k_spinouttype] == 2) if (player->kartstuff[k_spinouttype] == 2)
@ -5188,20 +5252,14 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
player->kartstuff[k_justbumped]--; player->kartstuff[k_justbumped]--;
// This doesn't go in HUD update because it has potential gameplay ramifications // This doesn't go in HUD update because it has potential gameplay ramifications
if (player->kartstuff[k_itemblink] && player->kartstuff[k_itemblink]-- <= 0) if (player->karthud[khud_itemblink] && player->karthud[khud_itemblink]-- <= 0)
{ {
player->kartstuff[k_itemblinkmode] = 0; player->karthud[khud_itemblinkmode] = 0;
player->kartstuff[k_itemblink] = 0; player->karthud[khud_itemblink] = 0;
} }
K_KartPlayerHUDUpdate(player); K_KartPlayerHUDUpdate(player);
if (player->kartstuff[k_voices])
player->kartstuff[k_voices]--;
if (player->kartstuff[k_tauntvoices])
player->kartstuff[k_tauntvoices]--;
if (G_BattleGametype() && player->kartstuff[k_bumper] > 0) if (G_BattleGametype() && player->kartstuff[k_bumper] > 0)
player->kartstuff[k_wanted]++; player->kartstuff[k_wanted]++;
@ -7687,11 +7745,11 @@ static void K_drawKartItem(void)
localpatch = kp_nodraw; localpatch = kp_nodraw;
} }
if (stplyr->kartstuff[k_itemblink] && (leveltime & 1)) if (stplyr->karthud[khud_itemblink] && (leveltime & 1))
{ {
colormode = TC_BLINK; colormode = TC_BLINK;
switch (stplyr->kartstuff[k_itemblinkmode]) switch (stplyr->karthud[khud_itemblinkmode])
{ {
case 2: case 2:
localcolor = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))); localcolor = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
@ -8302,19 +8360,11 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
} }
} }
#define RINGANIM_NUMFRAMES 10
#define RINGANIM_FLIPFRAME (RINGANIM_NUMFRAMES/2) #define RINGANIM_FLIPFRAME (RINGANIM_NUMFRAMES/2)
#define RINGANIM_DELAYMAX 5
static void K_drawKartLapsAndRings(void) static void K_drawKartLapsAndRings(void)
{ {
// TODO: turn these into player variables SINT8 ringanim_realframe = stplyr->karthud[khud_ringframe];
static UINT8 ringanim_frame = 0;
static UINT8 ringanim_tics = 0;
static UINT8 ringanim_delay = RINGANIM_DELAYMAX+1;
static UINT8 ringlockanim = 0;
SINT8 ringanim_realframe = ringanim_frame;
INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT); INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT);
UINT8 rn[2]; UINT8 rn[2];
INT32 ringflip = 0; INT32 ringflip = 0;
@ -8333,63 +8383,13 @@ static void K_drawKartLapsAndRings(void)
else if (stplyr->kartstuff[k_rings] >= 20) // Maxed out else if (stplyr->kartstuff[k_rings] >= 20) // Maxed out
ringmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_YELLOW, GTC_CACHE); ringmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_YELLOW, GTC_CACHE);
if (ringanim_frame > RINGANIM_FLIPFRAME) if (stplyr->karthud[khud_ringframe] > RINGANIM_FLIPFRAME)
{ {
ringflip = V_FLIP; ringflip = V_FLIP;
ringanim_realframe = RINGANIM_NUMFRAMES-ringanim_frame; ringanim_realframe = RINGANIM_NUMFRAMES-stplyr->karthud[khud_ringframe];
ringx += SHORT((splitscreen > 1) ? kp_smallring[ringanim_realframe]->width : kp_ring[ringanim_realframe]->width); ringx += SHORT((splitscreen > 1) ? kp_smallring[ringanim_realframe]->width : kp_ring[ringanim_realframe]->width);
} }
// 0 is the fast spin animation, set at 30 tics of ring boost or higher!
if (stplyr->kartstuff[k_ringboost] >= 30)
ringanim_delay = 0;
else
ringanim_delay = ((RINGANIM_DELAYMAX+1) * (30 - stplyr->kartstuff[k_ringboost])) / 30;
if (ringanim_frame == 0 && ringanim_delay > RINGANIM_DELAYMAX)
{
ringanim_frame = 0;
ringanim_tics = 0;
}
else if ((ringanim_tics--) <= 0)
{
if (ringanim_delay == 0) // fast spin animation
{
ringanim_frame = ((ringanim_frame+2) % RINGANIM_NUMFRAMES);
ringanim_tics = 0;
}
else
{
ringanim_frame = ((ringanim_frame+1) % RINGANIM_NUMFRAMES);
ringanim_tics = min(RINGANIM_DELAYMAX, ringanim_delay)-1;
}
}
if (stplyr->kartstuff[k_ringlock])
{
UINT8 normalanim = (leveltime % 14);
UINT8 debtanim = 14 + (leveltime % 2);
if (ringlockanim >= 14) // debt animation
{
if ((stplyr->kartstuff[k_rings] > 0) // Get out of 0 ring animation
&& (normalanim == 3 || normalanim == 10)) // on these transition frames.
ringlockanim = normalanim;
else
ringlockanim = debtanim;
}
else // normal animation
{
if ((stplyr->kartstuff[k_rings] <= 0) // Go into 0 ring animation
&& (ringlockanim == 1 || ringlockanim == 8)) // on these transition frames.
ringlockanim = debtanim;
else
ringlockanim = normalanim;
}
}
else
ringlockanim = (leveltime % 14); // reset to normal anim next time
if (splitscreen > 1) if (splitscreen > 1)
{ {
INT32 fx = 0, fy = 0, fr = 0; INT32 fx = 0, fy = 0, fr = 0;
@ -8508,7 +8508,7 @@ static void K_drawKartLapsAndRings(void)
// SPB ring lock // SPB ring lock
if (stplyr->kartstuff[k_ringlock]) if (stplyr->kartstuff[k_ringlock])
V_DrawScaledPatch(LAPS_X-5, LAPS_Y-28, V_HUDTRANS|splitflags, kp_ringspblock[ringlockanim]); V_DrawScaledPatch(LAPS_X-5, LAPS_Y-28, V_HUDTRANS|splitflags, kp_ringspblock[stplyr->karthud[khud_ringspblock]]);
// Lives // Lives
if (!netgame) if (!netgame)
@ -8522,7 +8522,6 @@ static void K_drawKartLapsAndRings(void)
#undef RINGANIM_NUMFRAMES #undef RINGANIM_NUMFRAMES
#undef RINGANIM_FLIPFRAME #undef RINGANIM_FLIPFRAME
#undef RINGANIM_DELAYMAX
static void K_drawKartSpeedometer(void) static void K_drawKartSpeedometer(void)
{ {
@ -9054,10 +9053,10 @@ static void K_drawKartFinish(void)
{ {
INT32 pnum = 0, splitflags = K_calcSplitFlags(0); INT32 pnum = 0, splitflags = K_calcSplitFlags(0);
if (!stplyr->kartstuff[k_cardanimation] || stplyr->kartstuff[k_cardanimation] >= 2*TICRATE) if (!stplyr->karthud[khud_cardanimation] || stplyr->karthud[khud_cardanimation] >= 2*TICRATE)
return; return;
if ((stplyr->kartstuff[k_cardanimation] % (2*5)) / 5) // blink if ((stplyr->karthud[khud_cardanimation] % (2*5)) / 5) // blink
pnum = 1; pnum = 1;
if (splitscreen > 1) // 3/4p, stationary FIN if (splitscreen > 1) // 3/4p, stationary FIN
@ -9076,7 +9075,7 @@ static void K_drawKartFinish(void)
x = ((vid.width<<FRACBITS)/vid.dupx); x = ((vid.width<<FRACBITS)/vid.dupx);
xval = (SHORT(kp_racefinish[pnum]->width)<<FRACBITS); xval = (SHORT(kp_racefinish[pnum]->width)<<FRACBITS);
x = ((TICRATE - stplyr->kartstuff[k_cardanimation])*(xval > x ? xval : x))/TICRATE; x = ((TICRATE - stplyr->karthud[khud_cardanimation])*(xval > x ? xval : x))/TICRATE;
if (splitscreen && stplyr == &players[displayplayers[1]]) if (splitscreen && stplyr == &players[displayplayers[1]])
x = -x; x = -x;
@ -9091,7 +9090,7 @@ static void K_drawKartFinish(void)
static void K_drawBattleFullscreen(void) static void K_drawBattleFullscreen(void)
{ {
INT32 x = BASEVIDWIDTH/2; INT32 x = BASEVIDWIDTH/2;
INT32 y = -64+(stplyr->kartstuff[k_cardanimation]); // card animation goes from 0 to 164, 164 is the middle of the screen INT32 y = -64+(stplyr->karthud[khud_cardanimation]); // card animation goes from 0 to 164, 164 is the middle of the screen
INT32 splitflags = V_SNAPTOTOP; // I don't feel like properly supporting non-green resolutions, so you can have a misuse of SNAPTO instead INT32 splitflags = V_SNAPTOTOP; // I don't feel like properly supporting non-green resolutions, so you can have a misuse of SNAPTO instead
fixed_t scale = FRACUNIT; fixed_t scale = FRACUNIT;
@ -9101,11 +9100,11 @@ static void K_drawBattleFullscreen(void)
|| (splitscreen > 1 && (stplyr == &players[displayplayers[2]] || (splitscreen > 1 && (stplyr == &players[displayplayers[2]]
|| (stplyr == &players[displayplayers[3]] && splitscreen > 2)))) || (stplyr == &players[displayplayers[3]] && splitscreen > 2))))
{ {
y = 232-(stplyr->kartstuff[k_cardanimation]/2); y = 232-(stplyr->karthud[khud_cardanimation]/2);
splitflags = V_SNAPTOBOTTOM; splitflags = V_SNAPTOBOTTOM;
} }
else else
y = -32+(stplyr->kartstuff[k_cardanimation]/2); y = -32+(stplyr->karthud[khud_cardanimation]/2);
if (splitscreen > 1) if (splitscreen > 1)
{ {
@ -9469,21 +9468,21 @@ static void K_drawChallengerScreen(void)
static void K_drawLapStartAnim(void) static void K_drawLapStartAnim(void)
{ {
// This is an EVEN MORE insanely complicated animation. // This is an EVEN MORE insanely complicated animation.
const UINT8 progress = 80-stplyr->kartstuff[k_lapanimation]; const UINT8 progress = 80-stplyr->karthud[khud_lapanimation];
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, stplyr->skincolor, GTC_CACHE); UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, stplyr->skincolor, GTC_CACHE);
V_DrawFixedPatch((BASEVIDWIDTH/2 + (32*max(0, stplyr->kartstuff[k_lapanimation]-76)))*FRACUNIT, V_DrawFixedPatch((BASEVIDWIDTH/2 + (32*max(0, stplyr->karthud[khud_lapanimation]-76)))*FRACUNIT,
(48 - (32*max(0, progress-76)))*FRACUNIT, (48 - (32*max(0, progress-76)))*FRACUNIT,
FRACUNIT, V_SNAPTOTOP|V_HUDTRANS, FRACUNIT, V_SNAPTOTOP|V_HUDTRANS,
(modeattacking ? kp_lapanim_emblem[1] : kp_lapanim_emblem[0]), colormap); (modeattacking ? kp_lapanim_emblem[1] : kp_lapanim_emblem[0]), colormap);
if (stplyr->kartstuff[k_laphand] >= 1 && stplyr->kartstuff[k_laphand] <= 3) if (stplyr->karthud[khud_laphand] >= 1 && stplyr->karthud[khud_laphand] <= 3)
{ {
V_DrawFixedPatch((BASEVIDWIDTH/2 + (32*max(0, stplyr->kartstuff[k_lapanimation]-76)))*FRACUNIT, V_DrawFixedPatch((BASEVIDWIDTH/2 + (32*max(0, stplyr->karthud[khud_lapanimation]-76)))*FRACUNIT,
(48 - (32*max(0, progress-76)) (48 - (32*max(0, progress-76))
+ 4 - abs((signed)((leveltime % 8) - 4)))*FRACUNIT, + 4 - abs((signed)((leveltime % 8) - 4)))*FRACUNIT,
FRACUNIT, V_SNAPTOTOP|V_HUDTRANS, FRACUNIT, V_SNAPTOTOP|V_HUDTRANS,
kp_lapanim_hand[stplyr->kartstuff[k_laphand]-1], NULL); kp_lapanim_hand[stplyr->karthud[khud_laphand]-1], NULL);
} }
if (stplyr->laps == (UINT8)(cv_numlaps.value - 1)) if (stplyr->laps == (UINT8)(cv_numlaps.value - 1))
@ -9844,14 +9843,14 @@ void K_drawKartHUD(void)
{ {
if (stplyr->exiting) if (stplyr->exiting)
K_drawKartFinish(); K_drawKartFinish();
else if (stplyr->kartstuff[k_lapanimation] && !splitscreen) else if (stplyr->karthud[khud_lapanimation] && !splitscreen)
K_drawLapStartAnim(); K_drawLapStartAnim();
} }
if (modeattacking) // everything after here is MP and debug only if (modeattacking) // everything after here is MP and debug only
return; return;
if (G_BattleGametype() && !splitscreen && (stplyr->kartstuff[k_yougotem] % 2)) // * YOU GOT EM * if (G_BattleGametype() && !splitscreen && (stplyr->karthud[khud_yougotem] % 2)) // * YOU GOT EM *
V_DrawScaledPatch(BASEVIDWIDTH/2 - (SHORT(kp_yougotem->width)/2), 32, V_HUDTRANS, kp_yougotem); V_DrawScaledPatch(BASEVIDWIDTH/2 - (SHORT(kp_yougotem->width)/2), 32, V_HUDTRANS, kp_yougotem);
// Draw FREE PLAY. // Draw FREE PLAY.

4
src/p_inter.c
View file

@ -494,7 +494,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
special->target->player->kartstuff[k_comebackpoints] += ptadd; special->target->player->kartstuff[k_comebackpoints] += ptadd;
if (ptadd > 1) if (ptadd > 1)
special->target->player->kartstuff[k_yougotem] = 2*TICRATE; special->target->player->karthud[khud_yougotem] = 2*TICRATE;
if (special->target->player->kartstuff[k_comebackpoints] >= 2) if (special->target->player->kartstuff[k_comebackpoints] >= 2)
K_StealBumper(special->target->player, player, true); K_StealBumper(special->target->player, player, true);
@ -557,7 +557,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
special->target->player->kartstuff[k_comebackpoints] += ptadd; special->target->player->kartstuff[k_comebackpoints] += ptadd;
if (ptadd > 1) if (ptadd > 1)
special->target->player->kartstuff[k_yougotem] = 2*TICRATE; special->target->player->karthud[khud_yougotem] = 2*TICRATE;
if (special->target->player->kartstuff[k_comebackpoints] >= 2) if (special->target->player->kartstuff[k_comebackpoints] >= 2)
K_StealBumper(special->target->player, player, true); K_StealBumper(special->target->player, player, true);

2
src/p_mobj.c
View file

@ -3624,7 +3624,7 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
dummy.z = thiscam->z; dummy.z = thiscam->z;
dummy.height = thiscam->height; dummy.height = thiscam->height;
if (player->pflags & PF_TIMEOVER) if (player->pflags & PF_TIMEOVER)
player->kartstuff[k_timeovercam] = (2*TICRATE)+1; player->karthud[khud_timeovercam] = (2*TICRATE)+1;
if (!resetcalled && !(player->pflags & PF_NOCLIP || leveltime < introtime) && !P_CheckSight(&dummy, player->mo)) // TODO: "P_CheckCameraSight" instead. if (!resetcalled && !(player->pflags & PF_NOCLIP || leveltime < introtime) && !P_CheckSight(&dummy, player->mo)) // TODO: "P_CheckCameraSight" instead.
P_ResetCamera(player, thiscam); P_ResetCamera(player, thiscam);
else else

10
src/p_spec.c
View file

@ -4194,19 +4194,19 @@ DoneSection2:
if (nump > 1) if (nump > 1)
{ {
if (K_IsPlayerLosing(player)) if (K_IsPlayerLosing(player))
player->kartstuff[k_laphand] = 3; player->karthud[khud_laphand] = 3;
else else
{ {
if (nump > 2 && player->kartstuff[k_position] == 1) // 1st place in 1v1 uses thumbs up if (nump > 2 && player->kartstuff[k_position] == 1) // 1st place in 1v1 uses thumbs up
player->kartstuff[k_laphand] = 1; player->karthud[khud_laphand] = 1;
else else
player->kartstuff[k_laphand] = 2; player->karthud[khud_laphand] = 2;
} }
} }
else else
player->kartstuff[k_laphand] = 0; // No hands in FREE PLAY player->karthud[khud_laphand] = 0; // No hands in FREE PLAY
player->kartstuff[k_lapanimation] = 80; player->karthud[khud_lapanimation] = 80;
if (player->pflags & PF_NIGHTSMODE) if (player->pflags & PF_NIGHTSMODE)
player->drillmeter += 48*20; player->drillmeter += 48*20;

16
src/p_user.c
View file

@ -1721,7 +1721,7 @@ void P_DoPlayerExit(player_t *player)
*/ */
player->powers[pw_underwater] = 0; player->powers[pw_underwater] = 0;
player->powers[pw_spacetime] = 0; player->powers[pw_spacetime] = 0;
player->kartstuff[k_cardanimation] = 0; // srb2kart: reset battle animation player->karthud[khud_cardanimation] = 0; // srb2kart: reset battle animation
if (player == &players[consoleplayer]) if (player == &players[consoleplayer])
demo.savebutton = leveltime; demo.savebutton = leveltime;
@ -7037,7 +7037,7 @@ static void P_DeathThink(player_t *player)
if (player->pflags & PF_TIMEOVER) if (player->pflags & PF_TIMEOVER)
{ {
player->kartstuff[k_timeovercam]++; player->karthud[khud_timeovercam]++;
if (player->mo) if (player->mo)
{ {
player->mo->flags |= (MF_NOGRAVITY|MF_NOCLIP); player->mo->flags |= (MF_NOGRAVITY|MF_NOCLIP);
@ -7045,7 +7045,7 @@ static void P_DeathThink(player_t *player)
} }
} }
else else
player->kartstuff[k_timeovercam] = 0; player->karthud[khud_timeovercam] = 0;
K_KartPlayerHUDUpdate(player); K_KartPlayerHUDUpdate(player);
@ -7253,7 +7253,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
#endif #endif
if (player->pflags & PF_TIMEOVER) // 1 for momentum keep, 2 for turnaround if (player->pflags & PF_TIMEOVER) // 1 for momentum keep, 2 for turnaround
timeover = (player->kartstuff[k_timeovercam] > 2*TICRATE ? 2 : 1); timeover = (player->karthud[khud_timeovercam] > 2*TICRATE ? 2 : 1);
else else
timeover = 0; timeover = 0;
@ -7396,7 +7396,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
if (timeover) if (timeover)
{ {
const INT32 timeovercam = max(0, min(180, (player->kartstuff[k_timeovercam] - 2*TICRATE)*15)); const INT32 timeovercam = max(0, min(180, (player->karthud[khud_timeovercam] - 2*TICRATE)*15));
camrotate += timeovercam; camrotate += timeovercam;
} }
else if (leveltime < introtime) // Whoooshy camera! else if (leveltime < introtime) // Whoooshy camera!
@ -7470,10 +7470,10 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
dist += 4*(player->speed - K_GetKartSpeed(player, false)); dist += 4*(player->speed - K_GetKartSpeed(player, false));
dist += abs(thiscam->momz)/4; dist += abs(thiscam->momz)/4;
if (player->kartstuff[k_boostcam]) if (player->karthud[khud_boostcam])
{ {
dist -= FixedMul(11*dist/16, player->kartstuff[k_boostcam]); dist -= FixedMul(11*dist/16, player->karthud[khud_boostcam]);
height -= FixedMul(height, player->kartstuff[k_boostcam]); height -= FixedMul(height, player->karthud[khud_boostcam]);
} }
x = mo->x - FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist); x = mo->x - FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);