Changeset fbcfc35 in network-game

Timestamp:

Jun 9, 2013, 5:59:48 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

8795a38

Parents:

b978503

Message:

Add the Projectile class to the client project and add a list of projectiles to the client

Location:

client/Client

Files:

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

client/Client/Client.vcxproj

@@ -65 +65 @@
   <ItemGroup>
     <ClCompile Include="..\..\common\Common.cpp" />
+    <ClCompile Include="..\..\common\Projectile.cpp" />
     <ClCompile Include="..\..\common\WorldMap.cpp" />
     <ClCompile Include="..\..\common\Message.cpp" />
@@ -78 +79 @@
     <ClInclude Include="..\..\common\Common.h" />
     <ClInclude Include="..\..\common\Compiler.h" />
+    <ClInclude Include="..\..\common\Projectile.h" />
     <ClInclude Include="..\..\common\WorldMap.h" />
     <ClInclude Include="..\..\common\Message.h" />

client/Client/Client.vcxproj.filters

@@ -58 +58 @@
       <Filter>Source Files\common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\common\Projectile.cpp">
+      <Filter>Source Files\common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -90 +93 @@
       <Filter>Header Files\common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\common\Projectile.h">
+      <Filter>Header Files\common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>

client/Client/main.cpp

@@ -33 +33 @@
 #include "../../common/WorldMap.h"
 #include "../../common/Player.h"
+#include "../../common/Projectile.h"
 
 #include "Window.h"
@@ -47 +48 @@
 void initWinSock();
 void shutdownWinSock();
-void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, WorldMap *gameMap, map<unsigned int, Player>& mapPlayers, unsigned int& curPlayerId, int &scoreBlue, int &scoreRed);
+void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, WorldMap *gameMap, map<unsigned int, Player>& mapPlayers, map<unsigned int, Projectile>& mapProjectiles, unsigned int& curPlayerId, int &scoreBlue, int &scoreRed);
 void drawMap(WorldMap* gameMap);
 void drawPlayers(map<unsigned int, Player>& mapPlayers, ALLEGRO_FONT* font, unsigned int curPlayerId);
@@ -99 +100 @@
    doexit = false;
    map<unsigned int, Player> mapPlayers;
+   map<unsigned int, Projectile> mapProjectiles;
    unsigned int curPlayerId = -1;
    int scoreBlue, scoreRed;
@@ -299 +301 @@
                   map<unsigned int, Player>::iterator it;
 
+                  cout << "Detected a right-click" << endl;
+
                   Player* curPlayer;
                   for(it = mapPlayers.begin(); it != mapPlayers.end(); it++)
@@ -309 +313 @@
                   for(it = mapPlayers.begin(); it != mapPlayers.end(); it++)
                   {
+                     // need to check if the right-click was actually on this player
                      target = &it->second;
                      if (target->id != curPlayerId && target->team != curPlayer->team) {
@@ -323 +328 @@
 
       if (receiveMessage(&msgFrom, sock, &from) >= 0)
-         processMessage(msgFrom, state, chatConsole, gameMap, mapPlayers, curPlayerId, scoreBlue, scoreRed);
+         processMessage(msgFrom, state, chatConsole, gameMap, mapPlayers, mapProjectiles, curPlayerId, scoreBlue, scoreRed);
 
       if (redraw)
@@ -447 +452 @@
 }
 
-void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, WorldMap *gameMap, map<unsigned int, Player>& mapPlayers, unsigned int& curPlayerId, int &scoreBlue, int &scoreRed)
+void processMessage(NETWORK_MSG &msg, int &state, chat &chatConsole, WorldMap *gameMap, map<unsigned int, Player>& mapPlayers, map<unsigned int, Projectile>& mapProjectiles, unsigned int& curPlayerId, int &scoreBlue, int &scoreRed)
 {
    string response = string(msg.buffer);
@@ -623 +628 @@
             case MSG_TYPE_PROJECTILE:
             {
+               cout << "Received a prjectile message" << endl;
+
+               int id, x, y, targetId;
+
+               memcpy(&id, msg.buffer, 4);
+               memcpy(&x, msg.buffer+4, 4);
+               memcpy(&y, msg.buffer+8, 4);
+               memcpy(&targetId, msg.buffer+12, 4);
+
+               cout << "id" << id << endl;
+               cout << "x" << x << endl;
+               cout << "y" << y << endl;
+               cout << "Target" << targetId << endl;
+
                break;
             }