Changeset 0693e25 in network-game

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

Files:

• client/Client/main.cpp (modified) (5 diffs)
• common/Common.cpp (modified) (2 diffs)
• common/Common.h (modified) (1 diff)
• common/Game.cpp (modified) (2 diffs)
• common/Game.h (modified) (2 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)

common/Common.cpp

@@ -11 +11 @@
 
 using namespace std;
+
+FLOAT_POSITION POSITION::toFloat() {
+   FLOAT_POSITION floatPosition;
+   floatPosition.x = x;
+   floatPosition.y = y;
+
+   return floatPosition;
+}
+
+POSITION FLOAT_POSITION::toInt() {
+   POSITION position;
+   position.x = x;
+   position.y = y;
+
+   return position;
+}
 
 void set_nonblock(int sock)
@@ -58 +74 @@
    return sqrt( pow(xDiff,2) + pow(yDiff,2) );   
 }
+
+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;
+}

common/Common.h

@@ -16 +16 @@
 using namespace std;
 
-typedef struct
-{
+struct FLOAT_POSITION;
+
+struct POSITION {
+   int x;
+   int y;
+   FLOAT_POSITION toFloat();
+};
+
+struct FLOAT_POSITION {
    float x;
    float y;
-} FLOAT_POSITION;
-
-typedef struct
-{
-   int x;
-   int y;
-   FLOAT_POSITION toFloat() {
-      FLOAT_POSITION floatPosition;
-      floatPosition.x = x;
-      floatPosition.y = y;
-
-      return floatPosition;
-   }
-} POSITION;
+   POSITION toInt();
+};
 
 void set_nonblock(int sock);
 unsigned long long getCurrentMillis();
 string getCurrentDateTimeString();
+
+POSITION screenToMap(POSITION pos);
+POSITION mapToScreen(POSITION pos);
 float posDistance(FLOAT_POSITION pos1, FLOAT_POSITION pos2);
 

common/Game.cpp

@@ -1 +1 @@
 #include "Game.h"
+
+#include <allegro5/allegro_primitives.h>
+
+#include "Common.h"
 
 using namespace std;
@@ -74 +78 @@
    this->blueScore = score;
 }
+
+void Game::drawPlayers(ALLEGRO_FONT* font, unsigned int curPlayerId) {
+   map<unsigned int, Player*>::iterator it;
+
+   Player* p;
+   POSITION pos;
+   ALLEGRO_COLOR color;
+
+   for(it = players.begin(); it != players.end(); it++)
+   {
+      p = it->second;
+
+      if (p->isDead)
+         continue;
+
+      pos = mapToScreen(p->pos.toInt());
+
+      if (p->id == curPlayerId)
+         al_draw_filled_circle(pos.x, pos.y, 14, al_map_rgb(0, 0, 0));
+      
+      if (p->team == 0)
+         color = al_map_rgb(0, 0, 255);
+      else if (p->team == 1)
+         color = al_map_rgb(255, 0, 0);
+      
+      al_draw_filled_circle(pos.x, pos.y, 12, color);
+
+      // draw player class
+      int fontHeight = al_get_font_line_height(font);
+
+      string strClass;
+      switch (p->playerClass) {
+      case Player::CLASS_WARRIOR:
+         strClass = "W";
+         break;
+      case Player::CLASS_RANGER:
+         strClass = "R";
+         break;
+      case Player::CLASS_NONE:
+         strClass = "";
+         break;
+      default:
+         strClass = "";
+         break;
+      }
+      al_draw_text(font, al_map_rgb(0, 0, 0), pos.x, pos.y-fontHeight/2, ALLEGRO_ALIGN_CENTRE, strClass.c_str());
+
+      // 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 (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)
+         al_draw_filled_rectangle(pos.x+4, pos.y-18, pos.x+18, pos.y-4, al_map_rgb(0, 0, 255));
+      else if (p->hasRedFlag)
+         al_draw_filled_rectangle(pos.x+4, pos.y-18, pos.x+18, pos.y-4, al_map_rgb(255, 0, 0));
+   }
+}

common/Game.h

@@ -13 +13 @@
 #include <string>
 #include <map>
+
+#include <allegro5/allegro_font.h>
 
 #include "Player.h"
@@ -46 +48 @@
    void setBlueScore(int score);
    void setRedScore(int score);
+
+   void drawPlayers(ALLEGRO_FONT* font, unsigned int curPlayerId);
 };