why does this need a variable?
it just gets assigned kartstuff[k_aizdriftstrat] anyways?
This commit is contained in:
1 parent
55d9d64910
commit
6265d0e38e
6 files changed
+5
-10
No files matched your search
@@ -403,7 +403,6 @@ typedef struct player_s
|
||||
angle_t old_frameangle, old_frameangle2;
|
||||
|
||||
// SRB2Kart CEP: Sliptide rolling
|
||||
INT32 sliptidemem;
|
||||
angle_t sliproll;
|
||||
|
||||
INT16 lturn_max[MAXPREDICTTICS]; // What's the expected turn value for full-left for a number of frames back (to account for netgame latency)?
|
||||
|
||||
@@ -4622,7 +4622,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
||||
{
|
||||
if (sliprollrotate)
|
||||
{
|
||||
sliptiderollangle = thing->player->sliproll * (thing->player->sliptidemem);
|
||||
sliptiderollangle = thing->player->sliproll * thing->player->kartstuff[k_aizdriftstrat];
|
||||
pitchnroll += rollangle + FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle);
|
||||
}
|
||||
else
|
||||
|
||||
@@ -1378,7 +1378,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
|
||||
rollfactor = ((spr->mobj->rollmodel == true) ? 1 : 0);
|
||||
|
||||
rollang = sliptideroll
|
||||
? (spr->mobj->rollangle * rollfactor) + (sliptideroll * spr->mobj->player->sliptidemem)
|
||||
? (spr->mobj->rollangle * rollfactor) + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat])
|
||||
: (spr->mobj->rollangle * rollfactor);
|
||||
|
||||
fixed_t anglef = AngleFixed(rollang);
|
||||
|
||||
@@ -5662,7 +5662,6 @@ static void K_KartDrift(player_t *player, boolean onground)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Stop drifting
|
||||
if (player->kartstuff[k_spinouttimer] > 0 || player->speed < minspeed)
|
||||
{
|
||||
@@ -5671,7 +5670,6 @@ static void K_KartDrift(player_t *player, boolean onground)
|
||||
|
||||
if (!player->sliproll)
|
||||
{
|
||||
player->sliptidemem = 0;
|
||||
player->sliproll = 0;
|
||||
}
|
||||
|
||||
@@ -5694,8 +5692,6 @@ static void K_KartDrift(player_t *player, boolean onground)
|
||||
|
||||
if (player->sliproll < (32*ANG1))
|
||||
player->sliproll += (4*ANG1);
|
||||
|
||||
player->sliptidemem = player->kartstuff[k_aizdriftstrat];
|
||||
}
|
||||
|
||||
if (player->kartstuff[k_drift]
|
||||
|
||||
+2
-2
@@ -398,7 +398,7 @@ angle_t R_PlayerSliptideAngle(player_t *player)
|
||||
|
||||
mo = player->mo;
|
||||
|
||||
if (mo->player->sliproll == 0 && mo->player->sliptidemem == 0)
|
||||
if (mo->player->sliproll == 0 || mo->player->kartstuff[k_aizdriftstrat] == 0)
|
||||
return 0;
|
||||
|
||||
size_t rot = (mo->frame & FF_FRAMEMASK);
|
||||
@@ -429,7 +429,7 @@ angle_t R_PlayerSliptideAngle(player_t *player)
|
||||
if (sprframe->rotate != SRF_SINGLE || (mo->frame & FF_PAPERSPRITE))
|
||||
ang = R_PointToAngle(mo->x, mo->y) - mo->angle;
|
||||
|
||||
return FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mo->player->sliproll * mo->player->sliptidemem);
|
||||
return FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mo->player->sliproll * mo->player->kartstuff[k_aizdriftstrat]);
|
||||
}
|
||||
|
||||
INT32 R_GetHudUncap(void)
|
||||
|
||||
+1
-1
@@ -1352,7 +1352,7 @@ static void R_ProjectSprite(mobj_t *thing)
|
||||
{
|
||||
if (sliprollrotate)
|
||||
{
|
||||
sliptiderollangle = thing->player->sliproll * (thing->player->sliptidemem);
|
||||
sliptiderollangle = thing->player->sliproll * thing->player->kartstuff[k_aizdriftstrat];
|
||||
pitchnroll += rollangle + FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle);
|
||||
}
|
||||
else
|
||||
|
||||
Reference in new issue
Block a user