fix ObjectMovingOnRockStairs with follower with merrps system
This commit is contained in:
parent
d2f3d319a7
commit
54af254b05
1 changed files with 1 additions and 1 deletions
|
@ -2499,7 +2499,7 @@ bool8 ObjectMovingOnRockStairs(struct ObjectEvent *objectEvent, u8 direction)
|
||||||
s16 y = objectEvent->currentCoords.y;
|
s16 y = objectEvent->currentCoords.y;
|
||||||
|
|
||||||
// TODO followers on sideways stairs
|
// TODO followers on sideways stairs
|
||||||
if (IsFollowerVisible() && (objectEvent->isPlayer || objectEvent->localId == OBJ_EVENT_ID_FOLLOWER))
|
if (IsFollowerVisible() && GetFollowerObject() != NULL && (objectEvent->isPlayer || objectEvent->localId == OBJ_EVENT_ID_FOLLOWER))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
switch (direction)
|
switch (direction)
|
||||||
|
|
Loading…
Reference in a new issue