mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-22 10:02:01 +00:00
Merge branch 'scale-weather-speed' into 'master'
Scale weather momz See merge request KartKrew/Kart!629
This commit is contained in:
commit
0a1862a28c
2 changed files with 3 additions and 3 deletions
|
|
@ -3862,7 +3862,7 @@ void P_PrecipThinker(precipmobj_t *mobj)
|
|||
// Reset to ceiling!
|
||||
P_SetPrecipMobjState(mobj, mobj->info->spawnstate);
|
||||
mobj->z = (flip) ? (mobj->floorz) : (mobj->ceilingz);
|
||||
mobj->momz = -mobj->info->speed;
|
||||
mobj->momz = FixedMul(-mobj->info->speed, mapobjectscale);
|
||||
mobj->precipflags &= ~PCF_SPLASH;
|
||||
R_ResetPrecipitationMobjInterpolationState(mobj);
|
||||
}
|
||||
|
|
@ -10411,7 +10411,7 @@ static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype
|
|||
mobj->ceilingrover = NULL;
|
||||
|
||||
mobj->z = z;
|
||||
mobj->momz = -info->speed;
|
||||
mobj->momz = FixedMul(-info->speed, mapobjectscale);
|
||||
|
||||
if (info->speed < 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1854,7 +1854,7 @@ void P_SwitchWeather(preciptype_t newWeather)
|
|||
precipmobj->sprite = precipmobj->state->sprite;
|
||||
precipmobj->frame = precipmobj->state->frame;
|
||||
|
||||
precipmobj->momz = -mobjinfo[swap].speed;
|
||||
precipmobj->momz = FixedMul(-mobjinfo[swap].speed, mapobjectscale);
|
||||
precipmobj->precipflags &= ~(PCF_INVISIBLE|PCF_FLIP);
|
||||
|
||||
if (precipmobj->momz > 0)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue