Changeset 8c74150 in network-game for client/Client

Timestamp:

Jun 9, 2013, 7:29:59 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

11d21ee

Parents:

8795a38

Message:

The client processes PROJECTILE and REMOVE_PROJECTILE messages and draws moving projectiles on the screen

File:

• client/Client/main.cpp (modified) (5 diffs)

client/Client/main.cpp

@@ -13 +13 @@
 #endif
 
-#include <sys/types.h>
 #include <cstdio>
 #include <cstdlib>
+#include <cmath>
+#include <sys/types.h>
 #include <string>
 #include <iostream>
 #include <sstream>
-
-#include <map>
-
 #include <map>
 
@@ -360 +358 @@
             }
 
+            // update projectile positions
+            map<unsigned int, Projectile>::iterator it2;
+            for (it2 = mapProjectiles.begin(); it2 != mapProjectiles.end(); it2++)
+            {
+               cout << "Update projectile position" << endl;
+               it2->second.move(mapPlayers);
+            }
+
             drawMap(gameMap);
             drawPlayers(mapPlayers, font, curPlayerId);
+
+            // draw projectiles
+            for (it2 = mapProjectiles.begin(); it2 != mapProjectiles.end(); it2++)
+            {
+               cout << "Draw projectile" << endl;
+
+               Projectile proj = it2->second;
+
+               FLOAT_POSITION target = mapPlayers[proj.target].pos;
+               float angle =  atan2(target.y-proj.pos.toFloat().y, target.x-proj.pos.toFloat().x);
+
+               POSITION start, end;
+               start.x = cos(angle)*15+proj.pos.x;
+               start.y = sin(angle)*15+proj.pos.y;
+               end.x = proj.pos.x;
+               end.y = proj.pos.y;
+
+               start = mapToScreen(start);
+               end = mapToScreen(end);
+
+               al_draw_line(start.x, start.y, end.x, end.y, al_map_rgb(0, 0, 0), 4);
+            }
          }
 
@@ -628 +656 @@
             case MSG_TYPE_PROJECTILE:
             {
-               cout << "Received a prjectile message" << endl;
+               cout << "Received a PROJECTILE message" << endl;
 
                int id, x, y, targetId;
@@ -637 +665 @@
                memcpy(&targetId, msg.buffer+12, 4);
 
-               cout << "id" << id << endl;
-               cout << "x" << x << endl;
-               cout << "y" << y << endl;
-               cout << "Target" << targetId << endl;
+               cout << "id: " << id << endl;
+               cout << "x: " << x << endl;
+               cout << "y: " << y << endl;
+               cout << "Target: " << targetId << endl;
+
+               Projectile proj(x, y, targetId, 0);
+               proj.setId(id);
+
+               mapProjectiles[id] = proj;
 
                break;
@@ -646 +679 @@
             case MSG_TYPE_REMOVE_PROJECTILE:
             {
+                cout << "Received a REMOVE_PROJECTILE message" << endl;
+
+               int id;
+
+               memcpy(&id, msg.buffer, 4);
+               
+               mapProjectiles.erase(id);
+
                break;
             }