throw those into functions

This commit is contained in:
Alug committed 2024-10-28 07:38:58 +01:00
1 parent 588e52a673
commit d97815620f
1 file changed
+36 -50
+36 -50
View File
@@ -2098,6 +2098,38 @@ void K_MomentumToFacing(player_t *player)
player->mo->momy = FixedMul(player->mo->momy - player->cmomy, player->mo->friction) + player->cmomy;
}
static inline fixed_t K_GetProjectileSpeed(void)
{
switch (gamespeed)
{
case 0:
return 68*mapobjectscale; // Avg Speed is 34
break;
case 2:
return 96*mapobjectscale; // Avg Speed is 48
break;
default:
return 82*mapobjectscale; // Avg Speed is 41
break;
}
}
static inline fixed_t K_GetSneakerBoostSpeed(void)
{
switch (gamespeed)
{
case 0:
return 53740+768;
break;
case 2:
return 17294+768;
break;
default:
return 32768;
break;
}
}
// sets k_boostpower, k_speedboost, and k_accelboost to whatever we need it to be
static void K_GetKartBoostPower(player_t *player)
{
@@ -2131,18 +2163,7 @@ static void K_GetKartBoostPower(player_t *player)
if (player->kartstuff[k_sneakertimer]) // Sneaker
{
switch (gamespeed)
{
case 0:
speedboost = max(speedboost, 53740+768);
break;
case 2:
speedboost = max(speedboost, 17294+768);
break;
default:
speedboost = max(speedboost, 32768);
break;
}
speedboost = max(speedboost, K_GetSneakerBoostSpeed());
accelboost = max(accelboost, 8*FRACUNIT); // + 800%
}
@@ -3684,18 +3705,7 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
}
else
{
switch (gamespeed)
{
case 0:
PROJSPEED = 68*mapobjectscale; // Avg Speed is 34
break;
case 2:
PROJSPEED = 96*mapobjectscale; // Avg Speed is 48
break;
default:
PROJSPEED = 82*mapobjectscale; // Avg Speed is 41
break;
}
PROJSPEED = K_GetProjectileSpeed();
}
if (altthrow)
@@ -3923,18 +3933,7 @@ void K_PuntMine(mobj_t *thismine, mobj_t *punter)
if (!mine || P_MobjWasRemoved(mine))
return;
switch (gamespeed)
{
case 0:
spd = 68*mapobjectscale; // Avg Speed is 34
break;
case 2:
spd = 96*mapobjectscale; // Avg Speed is 48
break;
default:
spd = 82*mapobjectscale; // Avg Speed is 41
break;
}
spd = K_GetProjectileSpeed();
mine->flags |= MF_NOCLIPTHING;
@@ -4081,20 +4080,7 @@ static void K_DoHyudoroSteal(player_t *player)
void K_DoSneaker(player_t *player, INT32 type)
{
fixed_t intendedboost;
switch (gamespeed)
{
case 0:
intendedboost = 53740+768;
break;
case 2:
intendedboost = 17294+768;
break;
default:
intendedboost = 32768;
break;
}
const fixed_t intendedboost = K_GetSneakerBoostSpeed();
if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
{