diff --git a/src/k_hud.c b/src/k_hud.c index e1071c7ed..4b7b35fb1 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -1699,7 +1699,7 @@ static void K_drawKartItem(void) switch (stplyr->kartstuff[k_itemblinkmode]) { case 2: - localcolor = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))); + localcolor = K_RainbowColor(); break; case 1: localcolor = SKINCOLOR_RED; @@ -4110,7 +4110,7 @@ static void K_drawKartFirstPerson(void) // drift sparks! if ((leveltime & 1) && (stplyr->kartstuff[k_driftcharge] >= dsthree)) - colmap = R_GetTranslationColormap(TC_RAINBOW, (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))), GTC_CACHE); + colmap = R_GetTranslationColormap(TC_RAINBOW, K_RainbowColor(), GTC_CACHE); else if ((leveltime & 1) && (stplyr->kartstuff[k_driftcharge] >= dstwo)) colmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_KETCHUP, GTC_CACHE); else if ((leveltime & 1) && (stplyr->kartstuff[k_driftcharge] >= dsone)) diff --git a/src/k_kart.c b/src/k_kart.c index 30c4304f6..45aaa29d8 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -531,6 +531,15 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = { {120, 120, 96, 96, 97, 98, 98, 99, 81, 81, 69, 71, 73, 75, 77, 79}, // SKINCOLOR_CSUPER5 }; +// +// Gives you a color to use for rainbow effects (like invincibility). +// Return: Skincolor value. +// +UINT8 K_RainbowColor(void) +{ + return (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))); +} + // Define for getting accurate color brightness readings according to how the human eye sees them. // https://en.wikipedia.org/wiki/Relative_luminance // 0.2126 to red @@ -692,36 +701,46 @@ UINT8 K_GetKartColorByName(const char *name) return 0; } +// // returns the players skinnumber // accounts for localskins +// INT32 K_GetSkinNum(player_t *player) { return player->localskin ? (player->localskin - 1) : player->skin; } +// // returns the mobj skinnumber // accounts for localskins +// INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local) { return skin - K_GetSkinArray(local); } +// // returns the players skinnumber // accounts for localskins +// skin_t *K_GetMobjSkin(const mobj_t *mobj) { return mobj->localskin ? mobj->localskin : mobj->skin; } +// // returns the skin array to use // accounts for localskins +// skin_t *K_GetSkinArray(boolean local) { return local ? localskins : skins; } +// // returns the players skin // accounts for localskins +// skin_t *K_GetPlayerSkin(player_t *player) { return &K_GetSkinArray(player->skinlocal)[K_GetSkinNum(player)]; @@ -3131,7 +3150,7 @@ static UINT16 K_DriftSparkColor(player_t *player, INT32 charge) if (charge >= K_GetKartDriftSparkValue(player)*4) { - color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))); + color = K_RainbowColor(); } else if (charge >= K_GetKartDriftSparkValue(player)*2) { @@ -5453,7 +5472,7 @@ static UINT8 K_GetSpeedLineColor(player_t *player, boolean colorSpeed) else if (player->kartstuff[k_driftboost] <= 50) speedcolor = SKINCOLOR_RASPBERRY; else if (player->kartstuff[k_driftboost] <= 125) - speedcolor = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))); + speedcolor = K_RainbowColor(); if (cv_coloredspeedlines.value == 2) speedcolor = (leveltime & 1) ? playercolor : speedcolor; diff --git a/src/k_kart.h b/src/k_kart.h index e304b0f88..f3877c023 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -20,6 +20,7 @@ void K_LoadExtraVFX(void); extern UINT8 colortranslations[MAXTRANSLATIONS][16]; extern const char *KartColor_Names[MAXSKINCOLORS]; extern const UINT8 KartColor_Opposite[MAXSKINCOLORS*2]; +UINT8 K_RainbowColor(void); void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor); void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, boolean local); UINT8 K_GetKartColorByName(const char *name); diff --git a/src/p_mobj.c b/src/p_mobj.c index f86b23b46..5ca1dc80c 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7042,7 +7042,7 @@ static boolean P_MobjDeadThink(mobj_t *mobj) if (mobj->flags2 & MF2_AMBUSH) { mobj->colorized = true; - mobj->color = (1 + (leveltime % (MAXSKINCOLORS-1))); + mobj->color = K_RainbowColor(); mobj->frame |= FF_FULLBRIGHT; } else @@ -7893,7 +7893,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) P_SetScale(mobj, (mobj->destscale = mobj->target->scale)); if (mobj->target->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(mobj->target->player)*4) - mobj->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))); + mobj->color = K_RainbowColor(); else if (mobj->target->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(mobj->target->player)*2) mobj->color = SKINCOLOR_KETCHUP; else if (mobj->target->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(mobj->target->player)) @@ -8592,7 +8592,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) if (mobj->flags2 & MF2_AMBUSH) { mobj->colorized = true; - mobj->color = (1 + (leveltime % (MAXSKINCOLORS-1))); + mobj->color = K_RainbowColor(); mobj->frame |= FF_FULLBRIGHT; } else diff --git a/src/p_user.c b/src/p_user.c index c77e2998a..8fbaa204c 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1641,7 +1641,7 @@ static void P_CheckInvincibilityTimer(player_t *player) if (!player->powers[pw_invulnerability] && !player->kartstuff[k_invincibilitytimer]) return; - player->mo->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))); + player->mo->color = K_RainbowColor(); // Resume normal music stuff. if (player->powers[pw_invulnerability] == 1 || player->kartstuff[k_invincibilitytimer] == 1)