Index: common/Game.cpp
===================================================================
--- common/Game.cpp	(revision f41a7f944c0904ddffe09163e64afcf46e0a00ee)
+++ common/Game.cpp	(revision b48ef0995681563975dead9f94eb9d9b30fc09f1)
@@ -48,5 +48,5 @@
 
 bool Game::addPlayer(Player* p) {
-   if (players.count(p->id) == 0) {
+   if (players.find(p->id) == players.end()) {
       players[p->id] = p;
       return true;
Index: common/MessageContainer.h
===================================================================
--- common/MessageContainer.h	(revision f41a7f944c0904ddffe09163e64afcf46e0a00ee)
+++ common/MessageContainer.h	(revision b48ef0995681563975dead9f94eb9d9b30fc09f1)
@@ -35,4 +35,7 @@
 #define MSG_TYPE_LEAVE_GAME        19
 #define MSG_TYPE_GAME_INFO         20
+#define MSG_TYPE_JOIN_GAME_INFO    21
+#define MSG_TYPE_JOIN_GAME_FAILURE 22
+#define MSG_TYPE_JOIN_GAME_ACK     23
 
 typedef struct