Changeset 7efed11 in network-game

Timestamp:

May 18, 2013, 6:42:59 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

c987d79

Parents:

d436ac4

Message:

Removed the draw method from the Player class to avoid an allegro dependency on the server

Files:

• client/Client/main.cpp (modified) (1 diff)
• common/Player.cpp (modified) (1 diff)
• common/Player.h (modified) (1 diff)

client/Client/main.cpp

@@ -564 +564 @@
       pos = mapToScreen(p->pos);
 
-      p->draw(pos, p->id == curPlayerId);
+      if (p->id == curPlayerId)
+         al_draw_filled_circle(pos.x, pos.y, 12, al_map_rgb(255, 0, 0));
+      else
+         al_draw_filled_circle(pos.x, pos.y, 12, al_map_rgb(191, 0, 0));
+
+      if (o->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(o->hasRedFlag)
+         al_draw_filled_rectangle(pos.x+4, pos.y-18, pos.x+18, pos.y-4, al_map_rgb(255, 0, 0));
    }
 }

common/Player.cpp

@@ -91 +91 @@
 }
 
-void Player::draw(POSITION pos, bool curPlayer) {
-   if (curPlayer)
-      al_draw_filled_circle(pos.x, pos.y, 12, al_map_rgb(255, 0, 0));
-   else
-      al_draw_filled_circle(pos.x, pos.y, 12, al_map_rgb(191, 0, 0));
-
-   if (this->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(this->hasRedFlag)
-      al_draw_filled_rectangle(pos.x+4, pos.y-18, pos.x+18, pos.y-4, al_map_rgb(255, 0, 0));
-}
-
 bool Player::move(WorldMap *map) {
    int speed = 100; // pixels per second

common/Player.h

@@ -32 +32 @@
    void setAddr(sockaddr_in addr);
 
-   void draw(POSITION pos, bool curPlayer);
    bool move(WorldMap *map);