Changeset 10f6fc2 in network-game

Timestamp:

Jul 14, 2013, 9:42:56 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

198cf2d

Parents:

9b5d30b

Message:

The client uses MessageProcessor to send/receive messages

Location:

client/Client

Files:

• Client.vcxproj (modified) (2 diffs)
• Client.vcxproj.filters (modified) (2 diffs)
• main.cpp (modified) (12 diffs)

client/Client/Client.vcxproj

@@ -68 +68 @@
   <ItemGroup>
     <ClCompile Include="..\..\common\Common.cpp" />
+    <ClCompile Include="..\..\common\MessageProcessor.cpp" />
     <ClCompile Include="..\..\common\Projectile.cpp" />
     <ClCompile Include="..\..\common\WorldMap.cpp" />
@@ -83 +84 @@
     <ClInclude Include="..\..\common\Common.h" />
     <ClInclude Include="..\..\common\Compiler.h" />
+    <ClInclude Include="..\..\common\MessageProcessor.h" />
     <ClInclude Include="..\..\common\Projectile.h" />
     <ClInclude Include="..\..\common\WorldMap.h" />

client/Client/Client.vcxproj.filters

@@ -64 +64 @@
       <Filter>Source Files\gui</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\common\MessageProcessor.cpp">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -102 +105 @@
       <Filter>Header Files\gui</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\MessageProcessor.h">
+      <Filter>Header Files\common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>

client/Client/main.cpp

@@ -27 +27 @@
 #include <allegro5/allegro_primitives.h>
 
+#include "../../common/Common.h"
 #include "../../common/Message.h"
-#include "../../common/Common.h"
+#include "../../common/MessageProcessor.h"
 #include "../../common/WorldMap.h"
 #include "../../common/Player.h"
@@ -101 +102 @@
 string username;
 chat chatConsole;
+
+MessageProcessor msgProcessor;
 
 int main(int argc, char **argv)
@@ -279 +282 @@
                   msgTo.type = MSG_TYPE_PICKUP_FLAG;
                   memcpy(msgTo.buffer, &curPlayerId, 4);
-                  sendMessage(&msgTo, sock, &server);
+                  msgProcessor.sendMessage(&msgTo, sock, &server);
                }
                break;
@@ -304 +307 @@
                         msgTo.type = MSG_TYPE_DROP_FLAG;
                         memcpy(msgTo.buffer, &curPlayerId, 4);
-                        sendMessage(&msgTo, sock, &server);
+                        msgProcessor.sendMessage(&msgTo, sock, &server);
                      }
                   }
@@ -327 +330 @@
                   memcpy(msgTo.buffer+8, &pos.y, 4);
 
-                  sendMessage(&msgTo, sock, &server);
+                  msgProcessor.sendMessage(&msgTo, sock, &server);
                }
                else
@@ -354 +357 @@
                         memcpy(msgTo.buffer+4, &target->id, 4);
 
-                        sendMessage(&msgTo, sock, &server);
+                        msgProcessor.sendMessage(&msgTo, sock, &server);
                      }
                   }
@@ -361 +364 @@
       }
 
-      if (receiveMessage(&msgFrom, sock, &from) >= 0)
+      if (msgProcessor.receiveMessage(&msgFrom, sock, &from) >= 0)
          processMessage(msgFrom, state, chatConsole, gameMap, mapPlayers, mapProjectiles, curPlayerId, scoreBlue, scoreRed);
 
@@ -367 +370 @@
       {
          redraw = false;
+
+         msgProcessor.resendUnackedMessages(sock);
 
          wndCurrent->draw(display);
@@ -927 +932 @@
    memcpy(msgTo.buffer+username.size()+password.size()+2, &playerClass, 4);
 
-   sendMessage(&msgTo, sock, &server);
+   msgProcessor.sendMessage(&msgTo, sock, &server);
 }
 
@@ -944 +949 @@
    strcpy(msgTo.buffer+username.size()+1, strPassword.c_str());
 
-   sendMessage(&msgTo, sock, &server);
+   msgProcessor.sendMessage(&msgTo, sock, &server);
 }
 
@@ -955 +960 @@
    strcpy(msgTo.buffer, username.c_str());
 
-   sendMessage(&msgTo, sock, &server);
+   msgProcessor.sendMessage(&msgTo, sock, &server);
 }
 
@@ -973 +978 @@
    strcpy(msgTo.buffer, msg.c_str());
 
-   sendMessage(&msgTo, sock, &server);
+   msgProcessor.sendMessage(&msgTo, sock, &server);
 }