From 9f1d03d5b406fa56c02872df84c4fd9afe22df1e Mon Sep 17 00:00:00 2001 From: MysterD Date: Tue, 13 Oct 2020 18:11:40 -0700 Subject: [PATCH] Remove two-player hack for packet_object --- src/pc/network/packets/packet_object.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pc/network/packets/packet_object.c b/src/pc/network/packets/packet_object.c index ac7ac263e..0e9818595 100644 --- a/src/pc/network/packets/packet_object.c +++ b/src/pc/network/packets/packet_object.c @@ -121,8 +121,7 @@ void network_clear_sync_objects(void) { void network_set_sync_id(struct Object* o) { if (o->oSyncID != 0) { return; } - // two-player hack - u8 reserveId = (gNetworkLevelLoaded && gNetworkType == NT_CLIENT) ? 1 : 0; + u8 reserveId = gNetworkLevelLoaded ? gNetworkPlayerLocal->globalIndex : 0; for (u16 i = 0; i < MAX_SYNC_OBJECTS; i++) { if (gSyncObjects[nextSyncID].reserved == reserveId && gSyncObjects[nextSyncID].o == NULL) { break; }