apply additive blending to ghosts aswell when using "playerblendeffects"
same conditions as the others either be in sneakerboost, or go fast enough
This commit is contained in:
1 parent
d18c9a257a
commit
4cf27d40e9
3 files changed
+7
-5
No files matched your search
+3
-5
@@ -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;
|
||||
}
|
||||
|
||||
@@ -5370,7 +5368,7 @@ 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;
|
||||
@@ -5460,7 +5458,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);
|
||||
|
||||
@@ -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