Changes in client/Client/main.cpp [e607c0f:3b1efcc] in network-game

File:

• client/Client/main.cpp (modified) (9 diffs)

client/Client/main.cpp

@@ -23 +23 @@
 #include "../../common/Compiler.h"
 #include "../../common/Message.h"
-#include "../../common/Common.h"
 
 #include "Window.h"
@@ -201 +200 @@
       error("socket");
 
-   set_nonblock(sock);
-
    server.sin_family = AF_INET;
    hp = gethostbyname(argv[1]);
@@ -212 +209 @@
 
    al_start_timer(timer);
-
+ 
    while(!doexit)
    {
@@ -285 +282 @@
          }
       }
-
-      if (receiveMessage(&msgFrom, sock, &from) >= 0)
-      {
-         processMessage(msgFrom, state, chatConsole);
-         cout << "state: " << state << endl;
-      }
- 
-      if (redraw && al_is_event_queue_empty(event_queue))
-      {
+ 
+      if(redraw && al_is_event_queue_empty(event_queue)) {
          redraw = false;
  
@@ -374 +364 @@
       case STATE_START:
       {
-         cout << "In STATE_START" << endl;
-
          chatConsole.addLine(response);
 
@@ -460 +448 @@
 
    sendMessage(&msgTo, sock, &server);
+   receiveMessage(&msgFrom, sock, &from);
+   processMessage(msgFrom, state, chatConsole);
+   cout << "state: " << state << endl;
 }
 
@@ -477 +468 @@
 
    sendMessage(&msgTo, sock, &server);
+   receiveMessage(&msgFrom, sock, &from);
+   processMessage(msgFrom, state, chatConsole);
+   cout << "state: " << state << endl;
 }
 
@@ -488 +482 @@
 
    sendMessage(&msgTo, sock, &server);
+   receiveMessage(&msgFrom, sock, &from);
+   processMessage(msgFrom, state, chatConsole);
 }
 
@@ -506 +502 @@
 
    sendMessage(&msgTo, sock, &server);
-}
+   receiveMessage(&msgFrom, sock, &from);
+   processMessage(msgFrom, state, chatConsole);
+}