thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed fixed length hit lag

Browse source
This commit is contained in:
Sally Coolatta 2020-11-10 23:02:58 -05:00
parent 5f12dd156c
commit c86d496fef
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_collide.c
View file

@ -273,7 +273,7 @@ boolean K_MineCollide(mobj_t *t1, mobj_t *t2)
} }
else else
{ {
K_SetHitLagForObjects(t1, t2, 2, true); K_SetHitLagForObjects(t1, t2, 2);
K_PuntMine(t1, t2); K_PuntMine(t1, t2);
} }
} }

4
src/k_kart.c
View file

@ -2374,7 +2374,7 @@ angle_t K_MomentumAngle(mobj_t *mo)
} }
} }
void K_SetHitLagForObjects(mobj_t *mo1, mobj_t *mo2, INT32 tics, boolean fixed) void K_SetHitLagForObjects(mobj_t *mo1, mobj_t *mo2, INT32 tics)
{ {
boolean mo1valid = (mo1 && !P_MobjWasRemoved(mo1)); boolean mo1valid = (mo1 && !P_MobjWasRemoved(mo1));
boolean mo2valid = (mo2 && !P_MobjWasRemoved(mo2)); boolean mo2valid = (mo2 && !P_MobjWasRemoved(mo2));
@ -2382,7 +2382,7 @@ void K_SetHitLagForObjects(mobj_t *mo1, mobj_t *mo2, INT32 tics, boolean fixed)
INT32 tics1 = tics; INT32 tics1 = tics;
INT32 tics2 = tics; INT32 tics2 = tics;
if (mo1valid == true && mo2valid == true && fixed == false) if (mo1valid == true && mo2valid == true)
{ {
const fixed_t ticaddfactor = mapobjectscale * 8; const fixed_t ticaddfactor = mapobjectscale * 8;
const INT32 mintics = tics; const INT32 mintics = tics;

2
src/k_kart.h
View file

@ -40,7 +40,7 @@ void K_KartPlayerHUDUpdate(player_t *player);
void K_KartPlayerThink(player_t *player, ticcmd_t *cmd); void K_KartPlayerThink(player_t *player, ticcmd_t *cmd);
void K_KartPlayerAfterThink(player_t *player); void K_KartPlayerAfterThink(player_t *player);
angle_t K_MomentumAngle(mobj_t *mo); angle_t K_MomentumAngle(mobj_t *mo);
void K_SetHitLagForObjects(mobj_t *mo1, mobj_t *mo2, INT32 tics, boolean fixed); void K_SetHitLagForObjects(mobj_t *mo1, mobj_t *mo2, INT32 tics);
void K_DoInstashield(player_t *player); void K_DoInstashield(player_t *player);
void K_BattleHitPlayer(player_t *player, player_t *victim, UINT8 points, boolean reducewanted); void K_BattleHitPlayer(player_t *player, player_t *victim, UINT8 points, boolean reducewanted);
void K_RemoveBumper(player_t *player, mobj_t *inflictor, mobj_t *source); void K_RemoveBumper(player_t *player, mobj_t *inflictor, mobj_t *source);

14
src/p_inter.c
View file

@ -1075,7 +1075,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
if (LUAh_MobjDeath(target, inflictor, source, damagetype) || P_MobjWasRemoved(target)) if (LUAh_MobjDeath(target, inflictor, source, damagetype) || P_MobjWasRemoved(target))
return; return;
//K_SetHitLagForObjects(target, inflictor, 15, false); //K_SetHitLagForObjects(target, inflictor, 15);
// SRB2kart // SRB2kart
// I wish I knew a better way to do this // I wish I knew a better way to do this
@ -1672,7 +1672,7 @@ static boolean P_KillPlayer(player_t *player, mobj_t *inflictor, mobj_t *source,
break; break;
} }
K_SetHitLagForObjects(player->mo, inflictor, 15, false); K_SetHitLagForObjects(player->mo, inflictor, 15);
player->pflags &= ~PF_SLIDING; player->pflags &= ~PF_SLIDING;
player->powers[pw_carry] = CR_NONE; player->powers[pw_carry] = CR_NONE;
@ -1759,8 +1759,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
player_t *player; player_t *player;
boolean force = false; boolean force = false;
INT32 laglength = 2; INT32 laglength = 3;
boolean lagfixed = true;
if (objectplacing) if (objectplacing)
return false; return false;
@ -1778,7 +1777,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if ((damagetype & DMG_TYPEMASK) != DMG_NORMAL && (damagetype & DMG_TYPEMASK) != DMG_STING) if ((damagetype & DMG_TYPEMASK) != DMG_NORMAL && (damagetype & DMG_TYPEMASK) != DMG_STING)
{ {
laglength = 10; laglength = 10;
lagfixed = false;
} }
// Everything above here can't be forced. // Everything above here can't be forced.
@ -1953,7 +1951,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
} }
player->kartstuff[k_instashield] = 15; player->kartstuff[k_instashield] = 15;
K_SetHitLagForObjects(target, inflictor, laglength, lagfixed); K_SetHitLagForObjects(target, inflictor, laglength);
return true; return true;
} }
} }
@ -1975,7 +1973,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (source && source->player && target) if (source && source->player && target)
G_GhostAddHit((INT32) (source->player - players), target); G_GhostAddHit((INT32) (source->player - players), target);
K_SetHitLagForObjects(target, inflictor, laglength, lagfixed); K_SetHitLagForObjects(target, inflictor, laglength);
if (target->health <= 0) if (target->health <= 0)
{ {
@ -1983,7 +1981,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
return true; return true;
} }
//K_SetHitLagForObjects(target, inflictor, laglength, lagfixed); //K_SetHitLagForObjects(target, inflictor, laglength);
if (player) if (player)
P_ResetPlayer(target->player); P_ResetPlayer(target->player);