diff --git a/src/engine/level_script.c b/src/engine/level_script.c index 60dd99b14..ba8d7733f 100644 --- a/src/engine/level_script.c +++ b/src/engine/level_script.c @@ -453,9 +453,7 @@ static void level_cmd_begin_area(void) { gAreas[areaIndex].camera = gAreas[areaIndex].cameras[0]; } else { gAreas[areaIndex].camera = NULL; - for (u8 i = 0; i < POSSIBLE_NUM_PLAYERS; i++) { - memset(&gAreas[areaIndex].cameras[i], 0, sizeof(sizeof(struct Camera *) * POSSIBLE_NUM_PLAYERS)); // set them to null - } + memset(gAreas[areaIndex].cameras, 0, sizeof(struct Camera *) * POSSIBLE_NUM_PLAYERS); // set them to null } } diff --git a/src/pc/pc_main.c b/src/pc/pc_main.c index a3f4b5d00..aa6745e06 100644 --- a/src/pc/pc_main.c +++ b/src/pc/pc_main.c @@ -71,6 +71,8 @@ #include #endif +#include "game/local_multiplayer.h" + extern Vp D_8032CF00; OSMesg D_80339BEC; @@ -196,8 +198,6 @@ static s32 get_num_frames_to_draw(f64 t) { return (s32) MAX(1, numFramesNext - numFramesCurr); } -#include "game/local_multiplayer.h" - void produce_interpolation_frames_and_delay(void) { bool is30Fps = (!configUncappedFramerate && configFrameLimit == FRAMERATE);