From 930559bbcc72bdc120a6540eb40b4b4c94c3689a Mon Sep 17 00:00:00 2001
From: R2DLiu <zliu3301@gmail.com>
Date: Sun, 5 Dec 2021 16:28:09 -0500
Subject: [PATCH] temp commit, fix warnings and errors

---
 Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp   |  9 ++++-----
 Source/Core/Core/Slippi/SlippiGameReporter.cpp |  6 +++---
 Source/Core/Core/Slippi/SlippiNetplay.cpp      | 12 ++++++------
 Source/Core/Core/Slippi/SlippiNetplay.h        |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
index 290263f611..e4639b6b20 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
@@ -1517,7 +1517,6 @@ void CEXISlippi::handleOnlineInputs(u8* payload)
 
   if (isDisconnected())
   {
-    auto status = slippi_netplay->GetSlippiConnectStatus();
     m_read_queue.push_back(3);  // Indicate we disconnected
     return;
   }
@@ -2147,12 +2146,12 @@ void CEXISlippi::prepareOnlineMatchState()
       else
         rightTeamPlayers.push_back(i);
     }
-    int leftTeamSize = leftTeamPlayers.size();
-    int rightTeamSize = rightTeamPlayers.size();
+    auto leftTeamSize = leftTeamPlayers.size();
+    auto rightTeamSize = rightTeamPlayers.size();
     leftTeamPlayers.resize(4, 0);
     rightTeamPlayers.resize(4, 0);
-    leftTeamPlayers[3] = leftTeamSize;
-    rightTeamPlayers[3] = rightTeamSize;
+    leftTeamPlayers[3] = static_cast<u8>(leftTeamSize);
+    rightTeamPlayers[3] = static_cast<u8>(rightTeamSize);
   }
 
   // Add rng offset to output
diff --git a/Source/Core/Core/Slippi/SlippiGameReporter.cpp b/Source/Core/Core/Slippi/SlippiGameReporter.cpp
index 8fba33b17a..08b759d003 100644
--- a/Source/Core/Core/Slippi/SlippiGameReporter.cpp
+++ b/Source/Core/Core/Slippi/SlippiGameReporter.cpp
@@ -16,7 +16,7 @@
 #include <json.hpp>
 using json = nlohmann::json;
 
-static size_t receive(char* ptr, size_t size, size_t nmemb, void* rcvBuf)
+inline size_t receive(char* ptr, size_t size, size_t nmemb, void* rcvBuf)
 {
   size_t len = size * nmemb;
   INFO_LOG(SLIPPI_ONLINE, "[User] Received data: %d", len);
@@ -74,9 +74,9 @@ void SlippiGameReporter::StartReport(GameReport report)
   cv.notify_one();
 }
 
-void SlippiGameReporter::StartNewSession(std::vector<std::string> player_uids)
+void SlippiGameReporter::StartNewSession(std::vector<std::string> new_player_uids)
 {
-  this->player_uids = player_uids;
+  this->player_uids = new_player_uids;
   gameIndex = 1;
 }
 
diff --git a/Source/Core/Core/Slippi/SlippiNetplay.cpp b/Source/Core/Core/Slippi/SlippiNetplay.cpp
index 0db8233311..0fb0511703 100644
--- a/Source/Core/Core/Slippi/SlippiNetplay.cpp
+++ b/Source/Core/Core/Slippi/SlippiNetplay.cpp
@@ -273,7 +273,7 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet, ENetPeer* peer)
 
     ENetPacket* epac =
         enet_packet_create(spac.getData(), spac.getDataSize(), ENET_PACKET_FLAG_UNSEQUENCED);
-    int sendResult = enet_peer_send(peer, 2, epac);
+    enet_peer_send(peer, 2, epac);
   }
   break;
 
@@ -391,11 +391,11 @@ void SlippiNetplayClient::writeToPacket(sf::Packet& packet, SlippiPlayerSelectio
   packet << s.teamId;
 }
 
-void SlippiNetplayClient::WriteChatMessageToPacket(sf::Packet& packet, int messageId, u8 playerIdx)
+void SlippiNetplayClient::WriteChatMessageToPacket(sf::Packet& packet, int messageId, u8 player_id)
 {
   packet << static_cast<NetPlay::MessageId>(NetPlay::NP_MSG_SLIPPI_CHAT_MESSAGE);
   packet << messageId;
-  packet << playerIdx;
+  packet << player_id;
 }
 
 std::unique_ptr<SlippiPlayerSelections>
@@ -447,7 +447,7 @@ void SlippiNetplayClient::Send(sf::Packet& packet)
     }
 
     ENetPacket* epac = enet_packet_create(packet.getData(), packet.getDataSize(), flags);
-    int sendResult = enet_peer_send(m_server[i], channelId, epac);
+    enet_peer_send(m_server[i], channelId, epac);
   }
 }
 
@@ -1038,9 +1038,9 @@ s32 SlippiNetplayClient::CalcTimeOffsetUs()
     int end = bufSize - offset;
 
     int sum = 0;
-    for (int i = offset; i < end; i++)
+    for (int j = offset; j < end; j++)
     {
-      sum += buf[i];
+      sum += buf[j];
     }
 
     int count = end - offset;
diff --git a/Source/Core/Core/Slippi/SlippiNetplay.h b/Source/Core/Core/Slippi/SlippiNetplay.h
index 0c2fc710c0..90821f7a39 100644
--- a/Source/Core/Core/Slippi/SlippiNetplay.h
+++ b/Source/Core/Core/Slippi/SlippiNetplay.h
@@ -231,7 +231,7 @@ private:
 
 extern SlippiNetplayClient* SLIPPI_NETPLAY;  // singleton static pointer
 
-static bool IsOnline()
+inline bool IsOnline()
 {
   return SLIPPI_NETPLAY != nullptr;
 }