Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed extra change_area/level packet that the ripples PR added. It breaks too many things

This commit is contained in:
MysterD 2022-09-18 18:41:32 -07:00
parent adf8868976
commit 66a85b17ab
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/bettercamera.inc.h
View File

@ -122,7 +122,7 @@ s16 newcam_saved_defmode = -1;
extern bool gDjuiInMainMenu; extern bool gDjuiInMainMenu;
///This is called at every level initialisation. ///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_tilt = 1500;
newcam_yaw = -c->yaw+0x4000; //Mario and the camera's yaw have this offset between them. newcam_yaw = -c->yaw+0x4000; //Mario and the camera's yaw have this offset between them.
newcam_mode = NC_MODE_NORMAL; newcam_mode = NC_MODE_NORMAL;

19
src/pc/network/network.c
View File

@ -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) { static void network_remember_debug_packet(u8 id, bool sent) {
if (id == PACKET_ACK) { return; } if (id == PACKET_ACK) { return; }
if (id == PACKET_KEEP_ALIVE) { return; } if (id == PACKET_KEEP_ALIVE) { return; }
@ -419,10 +404,6 @@ void network_update(void) {
// check for level loaded event // check for level loaded event
if (networkLoadingLevel < LOADING_LEVEL_THRESHOLD) { if (networkLoadingLevel < LOADING_LEVEL_THRESHOLD) {
networkLoadingLevel++; 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) { if (!gNetworkAreaLoaded && networkLoadingLevel >= LOADING_LEVEL_THRESHOLD) {
gNetworkAreaLoaded = true; gNetworkAreaLoaded = true;
network_on_loaded_area(); network_on_loaded_area();