Some type fixes for packets and removed problematic ranges code.

MSU-CSE491 · Dec 10, 2023 · 7281711 · 7281711
1 parent a614d15
commit 7281711
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/source/Interfaces/MainInterface.hpp b/source/Interfaces/MainInterface.hpp
@@ -113,7 +113,7 @@ namespace i_2D {
 
         void ChooseTexture();
 
-        bool SetLargeGrid(bool b){ mGridSizeLarge = b; } 
+        void SetLargeGrid(bool b){ mGridSizeLarge = b; } 
 
         void Notify(const std::string & message,
                     const std::string & /*msg_type*/="none") override

diff --git a/source/Interfaces/NetWorth/client/ClientInterface.hpp b/source/Interfaces/NetWorth/client/ClientInterface.hpp
@@ -94,7 +94,7 @@ namespace netWorth{
                             itemMap, agentMap);
 
                 // Send instruction to server
-                sendPkt << actionID;
+                sendPkt << static_cast<uint64_t>(actionID);
 				sendPacket(sendPkt, m_ip.value(), m_port);
 
 				m_manager->clearActionMap();

diff --git a/source/Interfaces/NetWorth/client/ClientManager.hpp b/source/Interfaces/NetWorth/client/ClientManager.hpp
@@ -41,7 +41,7 @@ namespace netWorth{
          * @param pkt received packet
          */
         void packetToActionMap(sf::Packet pkt) {
-            size_t dataSize, agentID, actionID;
+            uint64_t dataSize, agentID, actionID;
             pkt >> dataSize;
             for (size_t i = 0; i < dataSize; i++) {
                 pkt >> agentID >> actionID;

diff --git a/source/Interfaces/NetWorth/server/ServerInterface.hpp b/source/Interfaces/NetWorth/server/ServerInterface.hpp
@@ -167,7 +167,7 @@ namespace netWorth
 
 			// receive player input
 			sf::Packet recvPkt;
-			size_t actionID;
+			uint64_t actionID;
 			receivePacket(recvPkt, m_ip, m_port);
 			recvPkt >> actionID;
 

diff --git a/source/Interfaces/NetWorth/server/ServerManager.hpp b/source/Interfaces/NetWorth/server/ServerManager.hpp
@@ -82,9 +82,9 @@ namespace netWorth{
             sf::Packet pkt;
 
             // serialize action map
-            pkt << m_action_map.size();
-            for (auto pair: m_action_map) {
-                pkt << pair.first << pair.second;
+            pkt << static_cast<uint64_t>(m_action_map.size());
+            for (auto [agent_id, action_id]: m_action_map) {
+                pkt << static_cast<uint64_t>(agent_id) << static_cast<uint64_t>(action_id);
             }
 
             return pkt;

diff --git a/source/Worlds/ProgramExecutor.hpp b/source/Worlds/ProgramExecutor.hpp
@@ -465,7 +465,7 @@ namespace worldlang {
 			} while (!(has<Identifier>(values.back()) 
 					&& static_cast<std::string>(as<Identifier>(values.back())) == "__INTERNAL_ENDARGS"));
 			values.pop_back(); // don't keep that one
-			std::ranges::reverse(values);
+			std::reverse(values.begin(), values.end());
 			return values;
 		}
 
@@ -657,8 +657,12 @@ namespace worldlang {
 							}
 							// Convert to identifiers specifically
 							std::vector< Identifier > identifiers;
-							std::ranges::transform(identifier_values, std::back_inserter(identifiers), [this](const Value& v){ return as<Identifier>(v); });
-							//ex. a,b,c=1,2,3 becomes the follwoing units
+							std::transform(
+                identifier_values.begin(), identifier_values.end(),
+                std::back_inserter(identifiers),
+                [this](const Value& v){ return as<Identifier>(v); }
+              );
+							//ex. a,b,c=1,2,3 becomes the following units
 							// . a b c . 1 2 3 =
 							// v: 3 2 1
 							// i: c b a

diff --git a/source/group_5_client_main.cpp b/source/group_5_client_main.cpp
@@ -23,7 +23,7 @@ void terminateClient() {
     // Request connection to server
     sf::Packet sendPkt;
     std::optional<sf::IpAddress> ipAddr = sf::IpAddress::resolve(clientKillIP);
-    sendPkt << static_cast<size_t>(9999);
+    sendPkt << static_cast<uint64_t>(9999);
     if (clientKillSocket->send(sendPkt, ipAddr.value(), clientKillPort) != sf::Socket::Status::Done) {
         std::cerr << "Failed to send" << std::endl;
     }