diff --git a/src/game/bettercamera.inc.h b/src/game/bettercamera.inc.h index 42126499..28a7c19b 100644 --- a/src/game/bettercamera.inc.h +++ b/src/game/bettercamera.inc.h @@ -122,7 +122,7 @@ s16 newcam_saved_defmode = -1; extern bool gDjuiInMainMenu; ///This is called at every level initialisation. -void newcam_init(struct Camera *c, u8 dv) { +void newcam_init(struct Camera *c, UNUSED u8 dv) { newcam_tilt = 1500; newcam_yaw = -c->yaw+0x4000; //Mario and the camera's yaw have this offset between them. newcam_mode = NC_MODE_NORMAL; diff --git a/src/pc/network/network.c b/src/pc/network/network.c index 0d9bb6a8..c29624ec 100644 --- a/src/pc/network/network.c +++ b/src/pc/network/network.c @@ -172,21 +172,6 @@ void network_on_loaded_area(void) { } } -// Same as network_on_loaded_area, but does not call area_remove_sync_ids_clear() -void network_on_loaded_area_no_clear(void) { - struct NetworkPlayer* np = gNetworkPlayerLocal; - if (np != NULL) { - bool levelMatch = (np->currCourseNum == gCurrCourseNum - && np->currActNum == gCurrActStarNum - && np->currLevelNum == gCurrLevelNum); - if (np->currLevelSyncValid && levelMatch && np->currAreaIndex != gCurrAreaIndex) { - network_send_change_area(); - } else { - network_send_change_level(); - } - } -} - static void network_remember_debug_packet(u8 id, bool sent) { if (id == PACKET_ACK) { return; } if (id == PACKET_KEEP_ALIVE) { return; } @@ -419,10 +404,6 @@ void network_update(void) { // check for level loaded event if (networkLoadingLevel < LOADING_LEVEL_THRESHOLD) { networkLoadingLevel++; - // Send area/level update without LOADING_LEVEL_THRESHOLD delay - if (networkLoadingLevel == 1) { - network_on_loaded_area_no_clear(); - } if (!gNetworkAreaLoaded && networkLoadingLevel >= LOADING_LEVEL_THRESHOLD) { gNetworkAreaLoaded = true; network_on_loaded_area();