Merge branch 'nogravbulbturbine' into 'master'

Removed nogravity flag on touching bulbs/turbines (fixes #245)

Closes #245

See merge request kart-krew-dev/ring-racers!46
This commit is contained in:
Eidolon 2025-09-30 17:02:54 -05:00
commit 11acb78875
2 changed files with 2 additions and 1 deletions

View file

@ -292,7 +292,7 @@ void Obj_BulbTouched(mobj_t *special, mobj_t *toucher)
P_MoveOrigin(toucher, special->x, special->y, special->z);
toucher->player->nocontrol = 1;
P_SetTarget(&toucher->tracer, special);
toucher->flags &= ~MF_SHOOTABLE;
toucher->flags &= ~(MF_SHOOTABLE|MF_NOGRAVITY);
toucher->renderflags |= RF_DONTDRAW;
P_SetTarget(&special->target, toucher);
special->extravalue1 = spd;

View file

@ -220,6 +220,7 @@ void Obj_playerWPZTurbine(player_t *p)
}
mt = t->spawnpoint;
pmo->flags &= ~MF_NOGRAVITY;
opt1 = (mt->thing_args[0] != 0);