mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-29 07:32:02 +00:00
Merge branch 'nodoublecrumble' into 'next'
Prevent floating crumbling platforms from being triggered twice Closes #797 and #594 See merge request STJr/SRB2!1817
This commit is contained in:
commit
2aa9a92e7e
1 changed files with 0 additions and 1 deletions
|
@ -591,7 +591,6 @@ void T_BounceCheese(bouncecheese_t *bouncer)
|
||||||
if (bouncer->sector->crumblestate == CRUMBLE_RESTORE || bouncer->sector->crumblestate == CRUMBLE_WAIT
|
if (bouncer->sector->crumblestate == CRUMBLE_RESTORE || bouncer->sector->crumblestate == CRUMBLE_WAIT
|
||||||
|| bouncer->sector->crumblestate == CRUMBLE_ACTIVATED) // Oops! Crumbler says to remove yourself!
|
|| bouncer->sector->crumblestate == CRUMBLE_ACTIVATED) // Oops! Crumbler says to remove yourself!
|
||||||
{
|
{
|
||||||
bouncer->sector->crumblestate = CRUMBLE_WAIT;
|
|
||||||
bouncer->sector->ceilingdata = NULL;
|
bouncer->sector->ceilingdata = NULL;
|
||||||
bouncer->sector->ceilspeed = 0;
|
bouncer->sector->ceilspeed = 0;
|
||||||
bouncer->sector->floordata = NULL;
|
bouncer->sector->floordata = NULL;
|
||||||
|
|
Loading…
Reference in a new issue