diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index f2658707dba7c5f84ee7c35f3aaaf0cd7415ea33..4b4011eeaa73a0c7e9c61001472d129e04585ad0 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -5755,6 +5755,15 @@ static void HWR_ProjectSprite(mobj_t *thing)
// New colormap stuff for skins Tails 06-07-2002
if (thing->colorized)
vis->colormap = R_GetTranslationColormap(TC_RAINBOW, thing->color, GTC_CACHE);
+ else if (thing->player && thing->player->dashmode >= DASHMODE_THRESHOLD
+ && (thing->player->charflags & SF_DASHMODE)
+ && ((leveltime/2) & 1))
+ {
+ if (thing->player->charflags & SF_MACHINE)
+ vis->colormap = R_GetTranslationColormap(TC_DASHMODE, 0, GTC_CACHE);
+ else
+ vis->colormap = R_GetTranslationColormap(TC_RAINBOW, thing->color, GTC_CACHE);
+ }
else if (thing->skin && thing->sprite == SPR_PLAY) // This thing is a player!
{
size_t skinnum = (skin_t*)thing->skin-skins;
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 8e0de38a6dd90b5986768a2cf02e30d3f7364982..9401d66f1f832d32eb4af951de0eaf09baa9dd3d 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1403,16 +1403,21 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
}
else if (spr->mobj->color)
{
- if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY)
+ if (spr->mobj->colorized)
+ skinnum = TC_RAINBOW;
+ else if (spr->mobj->player && spr->mobj->player->dashmode >= DASHMODE_THRESHOLD
+ && (spr->mobj->player->charflags & SF_DASHMODE)
+ && ((leveltime/2) & 1))
{
- if (spr->mobj->colorized)
- skinnum = TC_RAINBOW;
+ if (spr->mobj->player->charflags & SF_MACHINE)
+ skinnum = TC_DASHMODE;
else
- {
- skinnum = (INT32)((skin_t*)spr->mobj->skin-skins);
- }
+ skinnum = TC_RAINBOW;
}
- else skinnum = TC_DEFAULT;
+ else if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY)
+ skinnum = (INT32)((skin_t*)spr->mobj->skin-skins);
+ else
+ skinnum = TC_DEFAULT;
}
HWR_GetBlendedTexture(gpatch, (GLPatch_t *)md2->blendgrpatch, skinnum, spr->colormap, (skincolors_t)spr->mobj->color);
}
diff --git a/src/p_user.c b/src/p_user.c
index 15d19b63a31a0ba0f8deb66b50bf06aac1403e85..64e3f402267546a2a4e63e46fc5aa7c16d56333e 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -11873,8 +11873,8 @@ void P_PlayerThink(player_t *player)
player->pflags &= ~PF_SLIDING;
#define dashmode player->dashmode
- // Dash mode - thanks be to Iceman404
- if ((player->charflags & SF_DASHMODE) && !(player->gotflag) && !(maptol & TOL_NIGHTS)) // woo, dashmode! no nights tho.
+ // Dash mode - thanks be to VelocitOni
+ if ((player->charflags & SF_DASHMODE) && !player->gotflag && !player->powers[pw_carry] && !player->exiting && !(maptol & TOL_NIGHTS)) // woo, dashmode! no nights tho.
{
boolean totallyradical = player->speed >= FixedMul(player->runspeed, player->mo->scale);
boolean floating = (player->secondjump == 1);
@@ -11884,12 +11884,16 @@ void P_PlayerThink(player_t *player)
if (dashmode < DASHMODE_MAX)
dashmode++; // Counter. Adds 1 to dash mode per tic in top speed.
if (dashmode == DASHMODE_THRESHOLD) // This isn't in the ">=" equation because it'd cause the sound to play infinitely.
- S_StartSound(player->mo, sfx_s3ka2); // If the player enters dashmode, play this sound on the the tic it starts.
+ S_StartSound(player->mo, (player->charflags & SF_MACHINE) ? sfx_kc4d : sfx_cdfm40); // If the player enters dashmode, play this sound on the the tic it starts.
}
else if ((!totallyradical || !floating) && !(player->pflags & PF_SPINNING))
{
if (dashmode > 3)
+ {
dashmode -= 3; // Rather than lose it all, it gently counts back down!
+ if ((dashmode+3) >= DASHMODE_THRESHOLD && dashmode < DASHMODE_THRESHOLD)
+ S_StartSound(player->mo, sfx_kc65);
+ }
else
dashmode = 0;
}
@@ -11920,6 +11924,7 @@ void P_PlayerThink(player_t *player)
{
player->normalspeed = skins[player->skin].normalspeed;
player->jumpfactor = skins[player->skin].jumpfactor;
+ S_StartSound(player->mo, sfx_kc65);
}
dashmode = 0;
}
diff --git a/src/r_things.c b/src/r_things.c
index fb30fb6dbf85a3a4208f034dbf03c541c1f7bc3e..b6833d93216310de84134e8c2b9571a6b6053bd8 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -758,10 +758,13 @@ static void R_DrawVisSprite(vissprite_t *vis)
dc_translation = R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
else if (!(vis->cut & SC_PRECIP)
&& vis->mobj->player && vis->mobj->player->dashmode >= DASHMODE_THRESHOLD
- && (vis->mobj->player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE)
+ && (vis->mobj->player->charflags & SF_DASHMODE)
&& ((leveltime/2) & 1))
{
- dc_translation = R_GetTranslationColormap(TC_DASHMODE, 0, GTC_CACHE);
+ if (vis->mobj->player->charflags & SF_MACHINE)
+ dc_translation = R_GetTranslationColormap(TC_DASHMODE, 0, GTC_CACHE);
+ else
+ dc_translation = R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
}
else if (!(vis->cut & SC_PRECIP) && vis->mobj->skin && vis->mobj->sprite == SPR_PLAY) // MT_GHOST LOOKS LIKE A PLAYER SO USE THE PLAYER TRANSLATION TABLES. >_>
{
@@ -786,10 +789,13 @@ static void R_DrawVisSprite(vissprite_t *vis)
dc_translation = R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
else if (!(vis->cut & SC_PRECIP)
&& vis->mobj->player && vis->mobj->player->dashmode >= DASHMODE_THRESHOLD
- && (vis->mobj->player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE)
+ && (vis->mobj->player->charflags & SF_DASHMODE)
&& ((leveltime/2) & 1))
{
- dc_translation = R_GetTranslationColormap(TC_DASHMODE, 0, GTC_CACHE);
+ if (vis->mobj->player->charflags & SF_MACHINE)
+ dc_translation = R_GetTranslationColormap(TC_DASHMODE, 0, GTC_CACHE);
+ else
+ dc_translation = R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
}
else if (!(vis->cut & SC_PRECIP) && vis->mobj->skin && vis->mobj->sprite == SPR_PLAY) // This thing is a player!
{
diff --git a/src/sounds.c b/src/sounds.c
index 8dc97b1e635f302c7b45eb32c00926b3cef68600..791a7571e432b23343fcb39b63ca5a6d9c86bd7f 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -693,7 +693,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"cdfm37", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"cdfm38", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Drowning"},
{"cdfm39", false, 128, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""},
- {"cdfm40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
+ {"cdfm40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power up"},
{"cdfm41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"cdfm42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"cdfm43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
@@ -780,7 +780,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"kc4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"kc4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"kc4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
- {"kc4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
+ {"kc4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power up"},
{"kc4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"kc4f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"kc50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
@@ -804,7 +804,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"kc62", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"kc63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"kc64", false, 96, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Terrifying rumble"},
- {"kc65", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
+ {"kc65", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Power down"},
{"kc66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"kc67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
{"kc68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},