make some stuff also be able to spawn watertrails
This commit is contained in:
1 parent
8c0fa813fe
commit
b5c284f526
2 files changed
+87
-2
No files matched your search
+15
-2
@@ -5988,6 +5988,20 @@ static inline angle_t K_MomentumAngle(const mobj_t *mo, const fixed_t threshold)
|
||||
}
|
||||
}
|
||||
|
||||
// Returns kart speed from a stat. Boost power and scale are NOT taken into account, no player or object is necessary.
|
||||
static fixed_t K_GetKartSpeedFromStat(UINT8 kartspeed)
|
||||
{
|
||||
const fixed_t xspd = (3*FRACUNIT)/64;
|
||||
fixed_t g_cc = (((13 + (3*gamespeed)) << FRACBITS) / 16) + xspd;
|
||||
fixed_t k_speed = 148;
|
||||
fixed_t finalspeed;
|
||||
|
||||
k_speed += kartspeed*4; // 152 - 184
|
||||
|
||||
finalspeed = FixedMul(k_speed<<14, g_cc);
|
||||
return finalspeed;
|
||||
}
|
||||
|
||||
void K_SpawnWaterRunParticles(mobj_t *mobj)
|
||||
{
|
||||
if (!(watertrailunderlay_minstate && watertrailunderlay_maxstate && watertrail && watertrail_minstate && watertrail_maxstate) || // Check if we're missing something
|
||||
@@ -6024,8 +6038,7 @@ void K_SpawnWaterRunParticles(mobj_t *mobj)
|
||||
}
|
||||
else
|
||||
{
|
||||
//topSpeed = FixedMul(mobj->scale, K_GetKartSpeedFromStat(5));
|
||||
return;
|
||||
topSpeed = FixedMul(mobj->scale, K_GetKartSpeedFromStat(5));
|
||||
}
|
||||
|
||||
curSpeed = P_AproxDistance(mobj->momx, mobj->momy);
|
||||
|
||||
@@ -2843,6 +2843,73 @@ static boolean P_SceneryZMovement(mobj_t *mo)
|
||||
return true;
|
||||
}
|
||||
|
||||
static void P_MobjCheckWaterVisual(mobj_t *mobj)
|
||||
{
|
||||
fixed_t thingtop = mobj->z + mobj->height; // especially for players, infotable height does not neccessarily match actual height
|
||||
sector_t *sector = mobj->subsector->sector;
|
||||
ffloor_t *rover;
|
||||
|
||||
// Default if no water exists.
|
||||
mobj->watertop = mobj->waterbottom = mobj->z - 1000*FRACUNIT;
|
||||
|
||||
// Reset water state.
|
||||
mobj->eflags &= ~(MFE_UNDERWATER|MFE_TOUCHWATER|MFE_GOOWATER);
|
||||
|
||||
for (rover = sector->ffloors; rover; rover = rover->next)
|
||||
{
|
||||
fixed_t topheight, bottomheight;
|
||||
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE)
|
||||
|| (((rover->flags & FF_BLOCKPLAYER) && mobj->player)
|
||||
|| ((rover->flags & FF_BLOCKOTHERS) && !mobj->player)))
|
||||
continue;
|
||||
|
||||
topheight = *rover->topheight;
|
||||
bottomheight = *rover->bottomheight;
|
||||
|
||||
if (*rover->t_slope)
|
||||
topheight = P_GetZAt(*rover->t_slope, mobj->x, mobj->y);
|
||||
|
||||
if (*rover->b_slope)
|
||||
bottomheight = P_GetZAt(*rover->b_slope, mobj->x, mobj->y);
|
||||
|
||||
if (mobj->eflags & MFE_VERTICALFLIP)
|
||||
{
|
||||
if (topheight < (thingtop - FixedMul(mobj->info->height/2, mobj->scale))
|
||||
|| bottomheight > thingtop)
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (topheight < mobj->z
|
||||
|| bottomheight > (mobj->z + FixedMul(mobj->info->height/2, mobj->scale)))
|
||||
continue;
|
||||
}
|
||||
|
||||
// Set the watertop and waterbottom
|
||||
mobj->watertop = topheight;
|
||||
mobj->waterbottom = bottomheight;
|
||||
|
||||
// Just touching the water?
|
||||
if (((mobj->eflags & MFE_VERTICALFLIP) && thingtop - FixedMul(mobj->info->height, mobj->scale) < bottomheight)
|
||||
|| (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + FixedMul(mobj->info->height, mobj->scale) > topheight))
|
||||
{
|
||||
mobj->eflags |= MFE_TOUCHWATER;
|
||||
if (rover->flags & FF_GOOWATER && !(mobj->flags & MF_NOGRAVITY))
|
||||
mobj->eflags |= MFE_GOOWATER;
|
||||
}
|
||||
// Actually in the water?
|
||||
if (((mobj->eflags & MFE_VERTICALFLIP) && thingtop - FixedMul(mobj->info->height/2, mobj->scale) > bottomheight)
|
||||
|| (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + FixedMul(mobj->info->height/2, mobj->scale) < topheight))
|
||||
{
|
||||
mobj->eflags |= MFE_UNDERWATER;
|
||||
if (rover->flags & FF_GOOWATER && !(mobj->flags & MF_NOGRAVITY))
|
||||
mobj->eflags |= MFE_GOOWATER;
|
||||
}
|
||||
}
|
||||
|
||||
K_SpawnWaterRunParticles(mobj);
|
||||
}
|
||||
|
||||
//
|
||||
// P_MobjCheckWater
|
||||
//
|
||||
@@ -7665,6 +7732,8 @@ void P_MobjThinker(mobj_t *mobj)
|
||||
if (leveltime % 6 == 0)
|
||||
S_StartSound(mobj, mobj->info->activesound);
|
||||
}
|
||||
|
||||
P_MobjCheckWaterVisual(mobj);
|
||||
break;
|
||||
}
|
||||
case MT_JAWZ:
|
||||
@@ -7725,6 +7794,7 @@ void P_MobjThinker(mobj_t *mobj)
|
||||
&& GETSECSPECIAL(mobj->subsector->sector->special, 3) == 1))
|
||||
K_DoPogoSpring(mobj, 0, 1);
|
||||
|
||||
P_MobjCheckWaterVisual(mobj);
|
||||
break;
|
||||
}
|
||||
case MT_JAWZ_DUD:
|
||||
@@ -7766,6 +7836,7 @@ void P_MobjThinker(mobj_t *mobj)
|
||||
break;
|
||||
}
|
||||
case MT_BANANA:
|
||||
P_MobjCheckWaterVisual(mobj);
|
||||
case MT_EGGMANITEM:
|
||||
mobj->friction = ORIG_FRICTION/4;
|
||||
if (mobj->momx || mobj->momy)
|
||||
@@ -7789,6 +7860,7 @@ void P_MobjThinker(mobj_t *mobj)
|
||||
P_SpawnGhostMobj(mobj)->fuse = 3;
|
||||
if (mobj->threshold > 0)
|
||||
mobj->threshold--;
|
||||
P_MobjCheckWaterVisual(mobj);
|
||||
break;
|
||||
case MT_SINK:
|
||||
if (mobj->momx || mobj->momy)
|
||||
|
||||
Reference in new issue
Block a user