diff --git a/src/game/object_helpers.h b/src/game/object_helpers.h index 5934ce933..deef435c8 100644 --- a/src/game/object_helpers.h +++ b/src/game/object_helpers.h @@ -69,6 +69,7 @@ struct SpawnParticlesInfo extern u8 (*gContinueDialogFunction)(void); extern struct Object* gContinueDialogFunctionObject; +extern s16 gRoomOverride; Gfx *geo_update_projectile_pos_from_parent(s32 callContext, UNUSED struct GraphNode *node, Mat4 mtx); Gfx *geo_update_layer_transparency(s32 callContext, struct GraphNode *node, UNUSED void *context); diff --git a/src/pc/network/network.c b/src/pc/network/network.c index 440cd47ee..422a397a9 100644 --- a/src/pc/network/network.c +++ b/src/pc/network/network.c @@ -679,6 +679,7 @@ void network_shutdown(bool sendLeaving, bool exiting, bool popup, bool reconnect gOverrideNear = 0; gOverrideFar = 0; gOverrideFOV = 0; + gRoomOverride = -1; gCurrActStarNum = 0; gCurrActNum = 0; gCurrCreditsEntry = NULL;