Merge branch 'Saturn-Next' into Saturn-Testing
This commit is contained in:
commit
e25191d7df
6 files changed
+13
-10
No files matched your search
+1
-1
@@ -388,7 +388,7 @@ void HU_LoadGraphics(void)
|
||||
|
||||
// fps stuff
|
||||
framecounter = W_CachePatchName("FRAMER", PU_HUDGFX);
|
||||
frameslash = W_CachePatchName("FRAMESL", PU_HUDGFX);;
|
||||
frameslash = W_CachePatchName("FRAMESL", PU_HUDGFX);
|
||||
}
|
||||
|
||||
// Initialise Heads up
|
||||
|
||||
+6
-7
@@ -98,8 +98,6 @@ static void saltyhop_onchange(void)
|
||||
}
|
||||
}
|
||||
|
||||
static boolean K_SpeedLinesShouldBlend(player_t *player);
|
||||
|
||||
// SOME IMPORTANT VARIABLES DEFINED IN DOOMDEF.H:
|
||||
// gamespeed is cc (0 for easy, 1 for normal, 2 for hard)
|
||||
// franticitems is Frantic Mode items, bool
|
||||
@@ -3606,7 +3604,7 @@ void K_SpawnSparkleTrail(mobj_t *mo)
|
||||
|
||||
sparkle->color = mo->color;
|
||||
|
||||
if (cv_playerblendeffects.value && mo->player && K_SpeedLinesShouldBlend(mo->player))
|
||||
if (mo->player && K_PlayerEffectsShouldBlend(mo->player))
|
||||
sparkle->blendmode = AST_ADD;
|
||||
}
|
||||
|
||||
@@ -4506,7 +4504,7 @@ void K_DropItems(player_t *player)
|
||||
{
|
||||
mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM);
|
||||
P_SetScale(drop, drop->scale>>4);
|
||||
drop->destscale = (3*drop->destscale)/2;;
|
||||
drop->destscale = (3*drop->destscale)/2;
|
||||
|
||||
drop->angle = player->mo->angle + ANGLE_90;
|
||||
P_Thrust(drop,
|
||||
@@ -5370,12 +5368,13 @@ void K_KartPlayerHUDUpdate(player_t *player)
|
||||
player->kartstuff[k_cardanimation] = 0;
|
||||
}
|
||||
|
||||
static boolean K_SpeedLinesShouldBlend(player_t *player)
|
||||
boolean K_PlayerEffectsShouldBlend(player_t *player)
|
||||
{
|
||||
if (!cv_playerblendeffects.value || !player->mo)
|
||||
return false;
|
||||
|
||||
if (player->kartstuff[k_sneakertimer])
|
||||
if (player->kartstuff[k_sneakertimer] ||
|
||||
player->kartstuff[k_invincibilitytimer])
|
||||
return true;
|
||||
|
||||
// this is how the percentage speedometer calcs, i suck at maths so this was the easiest thing to do lmao
|
||||
@@ -5460,7 +5459,7 @@ FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, bool
|
||||
fast->colorized = true;
|
||||
}
|
||||
|
||||
if (colorSpeed && K_SpeedLinesShouldBlend(player))
|
||||
if (colorSpeed && K_PlayerEffectsShouldBlend(player))
|
||||
fast->blendmode = AST_ADD;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,6 +42,7 @@ void K_MatchGenericExtraFlags(mobj_t *mo, mobj_t *master);
|
||||
void K_RespawnChecker(player_t *player);
|
||||
void K_KartMoveAnimation(player_t *player);
|
||||
void K_KartPlayerHUDUpdate(player_t *player);
|
||||
boolean K_PlayerEffectsShouldBlend(player_t *player);
|
||||
void K_KartPlayerThink(player_t *player, ticcmd_t *cmd);
|
||||
void K_KartPlayerAfterThink(player_t *player);
|
||||
void K_DoInstashield(player_t *player);
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ extern "C" {
|
||||
#include "v_video.h"
|
||||
}
|
||||
|
||||
consvar_t cv_emotes = {"emotes", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};;
|
||||
consvar_t cv_emotes = {"emotes", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
static std::map<std::string, emote_t> emotes;
|
||||
|
||||
|
||||
+1
-1
@@ -3577,7 +3577,7 @@ static void P_CalculatePrecipFloor(precipmobj_t *mobj)
|
||||
if (!(rover->flags & FF_BLOCKOTHERS) && !(rover->flags & FF_SWIMMABLE))
|
||||
continue;
|
||||
|
||||
topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);;
|
||||
topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
|
||||
|
||||
if (topheight > mobj->floorz)
|
||||
mobj->floorz = topheight;
|
||||
|
||||
@@ -1195,6 +1195,9 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
|
||||
ghost->spritexoffset = mobj->spritexoffset;
|
||||
ghost->spriteyoffset = mobj->spriteyoffset;
|
||||
|
||||
if (mobj->player && K_PlayerEffectsShouldBlend(mobj->player))
|
||||
ghost->blendmode = AST_ADD;
|
||||
|
||||
ghost->pitch = mobj->pitch;
|
||||
ghost->roll = mobj->roll;
|
||||
ghost->sloperoll = mobj->sloperoll;
|
||||
|
||||
Reference in new issue
Block a user