mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-28 23:13:02 +00:00
Prevent walking through warp doors
This commit is contained in:
parent
b7795fd9d1
commit
6c687a5a73
2 changed files with 4858 additions and 0 deletions
|
@ -22,6 +22,7 @@ void door_animation_and_reset(s32 sp18) {
|
||||||
u8 door_allow_walk_through(void) {
|
u8 door_allow_walk_through(void) {
|
||||||
if (gCurrCourseNum != COURSE_NONE && gMarioStates[0].action == ACT_BUBBLED) { return TRUE; }
|
if (gCurrCourseNum != COURSE_NONE && gMarioStates[0].action == ACT_BUBBLED) { return TRUE; }
|
||||||
if (o->oAction == 0 || o->oAction > 2) { return FALSE; }
|
if (o->oAction == 0 || o->oAction > 2) { return FALSE; }
|
||||||
|
if (o->oInteractType == INTERACT_WARP_DOOR) { return FALSE; }
|
||||||
|
|
||||||
// special override for BBH's back door, camera gets stuck otherwise
|
// special override for BBH's back door, camera gets stuck otherwise
|
||||||
if (gCurrCourseNum == COURSE_BBH && o->oDoorUnkF8 == 28) {
|
if (gCurrCourseNum == COURSE_BBH && o->oDoorUnkF8 == 28) {
|
||||||
|
|
Loading…
Reference in a new issue