Changeset 58ca135 in network-game for client/Client

Timestamp:

Dec 22, 2013, 10:56:37 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

5ae8dca

Parents:

45734ff

Message:

Client handles PROJECTILE and REMOVE_PROJECTILE messages in individual games and updates projectile targets and move projectils in individual games as well

File:

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

client/Client/main.cpp

@@ -516 +516 @@
             }
 
+             // update projectile positions
+            map<unsigned int, Projectile>::iterator it2;
+            for (it2 = game->getProjectiles().begin(); it2 != game->getProjectiles().end(); it2++)
+            {
+               it2->second.move(game->getPlayers());
+            }
+
             GameRender::drawMap(game->getMap());
             GameRender::drawPlayers(game->getPlayers(), font, curPlayerId);
+
+            // draw projectiles
+            for (it2 = game->getProjectiles().begin(); it2 != game->getProjectiles().end(); it2++)
+            {
+               Projectile proj = it2->second;
+
+               FLOAT_POSITION target = game->getPlayers()[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);
+            }
          }
          else if (wndCurrent == wndGame)
@@ -1083 +1110 @@
                source->targetPlayer = targetId;
                source->isChasing = true;
+
+               break;
+            }
+            case MSG_TYPE_PROJECTILE:
+            {
+               cout << "Received a PROJECTILE message" << endl;
+
+               unsigned int projId, x, y, targetId;
+
+               memcpy(&projId, msg.buffer, 4);
+               memcpy(&x, msg.buffer+4, 4);
+               memcpy(&y, msg.buffer+8, 4);
+               memcpy(&targetId, msg.buffer+12, 4);
+
+               cout << "projId: " << projId << endl;
+               cout << "x: " << x << endl;
+               cout << "y: " << y << endl;
+               cout << "Target: " << targetId << endl;
+
+               Projectile proj(x, y, targetId, 0);
+               proj.setId(projId);
+
+               game->addProjectile(proj);
+
+               break;
+            }
+            case MSG_TYPE_REMOVE_PROJECTILE:
+            {
+                cout << "Received a REMOVE_PROJECTILE message" << endl;
+
+               unsigned int id;
+               memcpy(&id, msg.buffer, 4);
+               
+               game->removeProjectile(id);
 
                break;