Changeset e5697b1 in network-game for client/Client

Timestamp:

Jan 19, 2014, 8:02:22 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

1f6233e

Parents:

d05c484

Message:

Projectile drawing code moved to the GameRender class

Location:

client/Client

Files:

• GameRender.cpp (modified) (2 diffs)
• GameRender.h (modified) (2 diffs)
• main.cpp (modified) (1 diff)

client/Client/GameRender.cpp

@@ -2 +2 @@
 
 #include <allegro5/allegro_primitives.h>
+
+#include "../../common/Common.h"
 
 void GameRender::drawMap(WorldMap* gameMap)
@@ -113 +115 @@
    }
 }
+
+void GameRender::drawProjectiles(map<unsigned int, Projectile>& mapProjectiles, map<unsigned int, Player*>& mapPlayers)
+{
+   map<unsigned int, Projectile>::iterator it;
+   for (it = mapProjectiles.begin(); it != mapProjectiles.end(); it++)
+   {
+      Projectile proj = it->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);
+   }
+}

client/Client/GameRender.h

@@ -18 +18 @@
 
 #include "../../common/Player.h"
+#include "../../common/Projectile.h"
 #include "../../common/WorldMap.h"
 
@@ -25 +26 @@
    static void drawMap(WorldMap* gameMap);
    static void drawPlayers(map<unsigned int, Player*>& mapPlayers, ALLEGRO_FONT* font, unsigned int curPlayerId);
+   static void drawProjectiles(map<unsigned int, Projectile>& mapProjectiles, map<unsigned int, Player*>& mapPLayers);
 };
 

client/Client/main.cpp

@@ -520 +520 @@
             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);
-            }
+            GameRender::drawProjectiles(game->getProjectiles(), game->getPlayers());
          }
          else if (wndCurrent == wndGameSummary)