diff --git a/src/pc/network/network_player.c b/src/pc/network/network_player.c index 0c22863e1..11d25797a 100644 --- a/src/pc/network/network_player.c +++ b/src/pc/network/network_player.c @@ -25,22 +25,6 @@ void network_player_update_model(u8 localIndex) { m->marioObj->header.gfx.sharedChild = gLoadedGraphNodes[m->character->modelId]; } -u8 network_player_unique_palette(u8 palette) { - u16 iterations = 0; - retry_palette: - for (int i = 0; i < MAX_PLAYERS; i++) { - if (!gNetworkPlayers[i].connected) { continue; } - if (gNetworkPlayers[i].paletteIndex == palette) { - palette = (palette + 1) % gNumPlayerColors; - if (iterations++ >= gNumPlayerColors) { - return palette; - } - goto retry_palette; - } - } - return palette; -} - bool network_player_any_connected(void) { for (int i = 1; i < MAX_PLAYERS; i++) { if (gNetworkPlayers[i].connected) { return true; } diff --git a/src/pc/network/network_player.h b/src/pc/network/network_player.h index d27927daf..3ea716cea 100644 --- a/src/pc/network/network_player.h +++ b/src/pc/network/network_player.h @@ -48,7 +48,6 @@ extern struct NetworkPlayer* gNetworkPlayerServer; void network_player_init(void); void network_player_update_model(u8 localIndex); -u8 network_player_unique_palette(u8 palette); bool network_player_any_connected(void); u8 network_player_connected_count(void); struct NetworkPlayer* network_player_from_global_index(u8 globalIndex); diff --git a/src/pc/network/packets/packet_join.c b/src/pc/network/packets/packet_join.c index 62fe90ffa..bbd2e0d1c 100644 --- a/src/pc/network/packets/packet_join.c +++ b/src/pc/network/packets/packet_join.c @@ -61,9 +61,6 @@ void network_receive_join_request(struct Packet* p) { void network_send_join(struct Packet* joinRequestPacket) { SOFT_ASSERT(gNetworkType == NT_SERVER); - // make palette unique - sJoinRequestPlayerPalette = network_player_unique_palette(sJoinRequestPlayerPalette); - // do connection event joinRequestPacket->localIndex = network_player_connected(NPT_CLIENT, joinRequestPacket->localIndex, sJoinRequestPlayerModel, sJoinRequestPlayerPalette, sJoinRequestPlayerName); if (joinRequestPacket->localIndex == UNKNOWN_LOCAL_INDEX) {