Index: client/Client/GameRender.cpp
===================================================================
--- client/Client/GameRender.cpp	(revision 48801afdbe8c90d082871e29fc4e59ba3e65686d)
+++ client/Client/GameRender.cpp	(revision 85da77837157eedc745cb17c9d85ec1f2ad811c2)
@@ -96,7 +96,7 @@
          al_draw_filled_circle(pos.x, pos.y, 14, al_map_rgb(0, 0, 0));
       
-      if (p->team == 1)
+      if (p->team == Player::TEAM_BLUE)
          color = al_map_rgb(0, 0, 255);
-      else if (p->team == 2)
+      else if (p->team == Player::TEAM_RED)
          color = al_map_rgb(255, 0, 0);
       else {
Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision 48801afdbe8c90d082871e29fc4e59ba3e65686d)
+++ client/Client/main.cpp	(revision 85da77837157eedc745cb17c9d85ec1f2ad811c2)
@@ -1546,5 +1546,5 @@
 void joinWaitingArea() {
    cout << "joining waiting area" << endl;
-   currentPlayer->team = 0;
+   currentPlayer->team = Player::TEAM_NONE;
 
    msgTo.type = MSG_TYPE_JOIN_TEAM;
@@ -1556,5 +1556,5 @@
 void joinBlueTeam() {
    cout << "joining blue team" << endl;
-   currentPlayer->team = 1;
+   currentPlayer->team = Player::TEAM_BLUE;
 
    msgTo.type = MSG_TYPE_JOIN_TEAM;
@@ -1566,5 +1566,5 @@
 void joinRedTeam() {
    cout << "joining red team" << endl;
-   currentPlayer->team = 2;
+   currentPlayer->team = Player::TEAM_RED;
 
    msgTo.type = MSG_TYPE_JOIN_TEAM;
Index: common/Game.cpp
===================================================================
--- common/Game.cpp	(revision 48801afdbe8c90d082871e29fc4e59ba3e65686d)
+++ common/Game.cpp	(revision 85da77837157eedc745cb17c9d85ec1f2ad811c2)
@@ -184,5 +184,5 @@
          switch (it->type) {
             case OBJECT_BLUE_FLAG:
-               if (p->team == 2) {
+               if (p->team == Player::TEAM_RED) {
                   p->hasBlueFlag = true;
                   itemId = it->id;
@@ -190,5 +190,5 @@
                break;
             case OBJECT_RED_FLAG:
-               if (p->team == 1) {
+               if (p->team == Player::TEAM_BLUE) {
                   p->hasRedFlag = true;
                   itemId = it->id;