Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision ec48e7db6b5677ea8a45bc8f4004319738d29a9f)
+++ client/Client/main.cpp	(revision a4db787e5831bbbe5ce409f0af7e57ec3359b651)
@@ -138,5 +138,5 @@
    al_flip_display();
 
-   int sock, n;
+   int sock;
    struct sockaddr_in server, from;
    struct hostent *hp;
@@ -207,4 +207,5 @@
                      msgTo.type = MSG_TYPE_LOGIN;
                      username = input;
+
                      break;
                   }
@@ -220,4 +221,5 @@
                      else
                         msgTo.type = MSG_TYPE_CHAT;
+
                      break;
                   }
@@ -236,14 +238,11 @@
                }
 
-               n=sendMessage(&msgTo, sock, &server);
-               if (n < 0)
-                  error("sendMessage");
-
-               n = receiveMessage(&msgFrom, sock, &from);
-               if (n < 0)
-                  error("receiveMessage");
-
+               sendMessage(&msgTo, sock, &server);
+
+               receiveMessage(&msgFrom, sock, &from);
                string response = string(msgFrom.buffer);
 
+               // this whole select block should go in a new function.
+               // Figure out how to pass and return params properly
                switch(state)
                {
@@ -262,4 +261,5 @@
                         state = STATE_LOGIN;
                      }
+
                      break;
                   }