thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add thrust to Bubble Shield

Browse source
This commit is contained in:
TehRealSalt 2019-05-22 13:50:31 -04:00
parent 5ed356ea46
commit 414c2d4fb0
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_map.c
View file

@ -739,6 +739,9 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (tmthing->type == MT_PLAYER) if (tmthing->type == MT_PLAYER)
{ {
// K_KartBouncing causes desync, so we'll have to use a janky thrust instead
P_Thrust(tmthing, R_PointToAngle2(thing->x, thing->y, tmthing->x, tmthing->y), 4*thing->scale);
if (tmthing->player->kartstuff[k_spinouttimer] || tmthing->player->kartstuff[k_squishedtimer] if (tmthing->player->kartstuff[k_spinouttimer] || tmthing->player->kartstuff[k_squishedtimer]
|| tmthing->player->powers[pw_flashing] || tmthing->player->kartstuff[k_hyudorotimer] || tmthing->player->powers[pw_flashing] || tmthing->player->kartstuff[k_hyudorotimer]
|| tmthing->player->kartstuff[k_justbumped] || tmthing->scale > thing->scale + (mapobjectscale/8)) || tmthing->player->kartstuff[k_justbumped] || tmthing->scale > thing->scale + (mapobjectscale/8))
@ -746,7 +749,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
// Player Damage // Player Damage
P_DamageMobj(tmthing, thing, ((thing->type == MT_BUBBLESHIELD) ? thing->target : thing), 1); P_DamageMobj(tmthing, thing, ((thing->type == MT_BUBBLESHIELD) ? thing->target : thing), 1);
//K_KartBouncing(tmthing, thing, false, true); // Causes desync //K_KartBouncing(tmthing, thing, false, true);
S_StartSound(thing, sfx_s3k44); S_StartSound(thing, sfx_s3k44);
} }
else else
@ -789,6 +792,9 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (thing->type == MT_PLAYER) if (thing->type == MT_PLAYER)
{ {
// K_KartBouncing causes desync, so we'll have to use a janky thrust instead
P_Thrust(thing, R_PointToAngle2(tmthing->x, tmthing->y, thing->x, thing->y), 4*tmthing->scale);
if (thing->player->kartstuff[k_spinouttimer] || thing->player->kartstuff[k_squishedtimer] if (thing->player->kartstuff[k_spinouttimer] || thing->player->kartstuff[k_squishedtimer]
|| thing->player->powers[pw_flashing] || thing->player->kartstuff[k_hyudorotimer] || thing->player->powers[pw_flashing] || thing->player->kartstuff[k_hyudorotimer]
|| thing->player->kartstuff[k_justbumped] || thing->scale > tmthing->scale + (mapobjectscale/8)) || thing->player->kartstuff[k_justbumped] || thing->scale > tmthing->scale + (mapobjectscale/8))