Index: client/Client/GameRender.cpp
===================================================================
--- client/Client/GameRender.cpp	(revision 306758ef5412fe59b4375b110891389459409b21)
+++ client/Client/GameRender.cpp	(revision 426fb84d80ff779912355be9d6c298e75da3cdfa)
@@ -96,7 +96,7 @@
          al_draw_filled_circle(pos.x, pos.y, 14, al_map_rgb(0, 0, 0));
       
-      if (p->team == 0)
+      if (p->team == 1)
          color = al_map_rgb(0, 0, 255);
-      else if (p->team == 1)
+      else if (p->team == 2)
          color = al_map_rgb(255, 0, 0);
       else {
Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision 306758ef5412fe59b4375b110891389459409b21)
+++ client/Client/main.cpp	(revision 426fb84d80ff779912355be9d6c298e75da3cdfa)
@@ -505,11 +505,11 @@
             for (itPlayers = gamePlayers.begin(); itPlayers != gamePlayers.end(); itPlayers++) {
                switch (itPlayers->second->team) {
-               case -1:
+               case 0:
                   drawPosition = 200;
                   break;
-               case 0:
+               case 1:
                   drawPosition = 400;
                   break;
-               case 1:
+               case 2:
                   drawPosition = 600;
                   break;
@@ -1514,5 +1514,5 @@
 void joinWaitingArea() {
    cout << "joining waiting area" << endl;
-   currentPlayer->team = -1;
+   currentPlayer->team = 0;
 
    msgTo.type = MSG_TYPE_JOIN_TEAM;
@@ -1524,5 +1524,5 @@
 void joinBlueTeam() {
    cout << "joining blue team" << endl;
-   currentPlayer->team = 0;
+   currentPlayer->team = 1;
 
    msgTo.type = MSG_TYPE_JOIN_TEAM;
@@ -1534,5 +1534,5 @@
 void joinRedTeam() {
    cout << "joining red team" << endl;
-   currentPlayer->team = 1;
+   currentPlayer->team = 2;
 
    msgTo.type = MSG_TYPE_JOIN_TEAM;