Changeset 0693e25 in network-game for client/Client/main.cpp

Timestamp:

Sep 28, 2013, 2:11:19 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

6319311

Parents:

3ef8cf4

Message:

The client draws the map and players in individual games

File:

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

client/Client/main.cpp

@@ -54 +54 @@
 void drawMap(WorldMap* gameMap);
 void drawPlayers(map<unsigned int, Player>& mapPlayers, ALLEGRO_FONT* font, unsigned int curPlayerId);
-POSITION screenToMap(POSITION pos);
-POSITION mapToScreen(POSITION pos);
 int getRefreshRate(int width, int height);
 void drawMessageStatus(ALLEGRO_FONT* font);
@@ -483 +481 @@
             al_draw_text(font, al_map_rgb(0, 255, 0), 330, 80, ALLEGRO_ALIGN_LEFT, ossScoreBlue.str().c_str());
             al_draw_text(font, al_map_rgb(0, 255, 0), 515, 80, ALLEGRO_ALIGN_LEFT, ossScoreRed.str().c_str());
+
+            drawMap(game->getMap());
+            game->drawPlayers(font, curPlayerId);
          }
          else if (wndCurrent == wndGame)
@@ -613 +614 @@
    WSACleanup();
 #endif
-}
-
-POSITION screenToMap(POSITION pos)
-{
-   pos.x = pos.x-300;
-   pos.y = pos.y-100;
-
-   if (pos.x < 0 || pos.y < 0)
-   {
-      pos.x = -1;
-      pos.y = -1;
-   }
-
-   return pos;
-}
-
-POSITION mapToScreen(POSITION pos)
-{
-   pos.x = pos.x+300;
-   pos.y = pos.y+100;
-
-   return pos;
-}
-
-POSITION mapToScreen(FLOAT_POSITION pos)
-{
-   POSITION p;
-   p.x = pos.x+300;
-   p.y = pos.y+100;
-
-   return p;
 }
 
@@ -1049 +1019 @@
          continue;
 
-      pos = mapToScreen(p->pos);
+      pos = mapToScreen(p->pos.toInt());
 
       if (p->id == curPlayerId)
@@ -1083 +1053 @@
       // draw player health
       al_draw_filled_rectangle(pos.x-12, pos.y-24, pos.x+12, pos.y-16, al_map_rgb(0, 0, 0));
-      if (it->second.maxHealth != 0)
-         al_draw_filled_rectangle(pos.x-11, pos.y-23, pos.x-11+(22*it->second.health)/it->second.maxHealth, pos.y-17, al_map_rgb(255, 0, 0));
+      if (p->maxHealth != 0)
+         al_draw_filled_rectangle(pos.x-11, pos.y-23, pos.x-11+(22*p->health)/p->maxHealth, pos.y-17, al_map_rgb(255, 0, 0));
 
       if (p->hasBlueFlag)