Changeset cdb4bec in network-game for client/Client/main.cpp

Timestamp:

Dec 9, 2012, 8:59:18 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

3f5616f

Parents:

da692b9 (diff), e607c0f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:weretaco/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"
@@ -200 +201 @@
       error("socket");
 
+   set_nonblock(sock);
+
    server.sin_family = AF_INET;
    hp = gethostbyname(argv[1]);
@@ -209 +212 @@
 
    al_start_timer(timer);
- 
+
    while(!doexit)
    {
@@ -282 +285 @@
          }
       }
- 
-      if(redraw && al_is_event_queue_empty(event_queue)) {
+
+      if (receiveMessage(&msgFrom, sock, &from) >= 0)
+      {
+         processMessage(msgFrom, state, chatConsole);
+         cout << "state: " << state << endl;
+      }
+ 
+      if (redraw && al_is_event_queue_empty(event_queue))
+      {
          redraw = false;
  
@@ -364 +374 @@
       case STATE_START:
       {
+         cout << "In STATE_START" << endl;
+
          chatConsole.addLine(response);
 
@@ -448 +460 @@
 
    sendMessage(&msgTo, sock, &server);
-   receiveMessage(&msgFrom, sock, &from);
-   processMessage(msgFrom, state, chatConsole);
-   cout << "state: " << state << endl;
 }
 
@@ -468 +477 @@
 
    sendMessage(&msgTo, sock, &server);
-   receiveMessage(&msgFrom, sock, &from);
-   processMessage(msgFrom, state, chatConsole);
-   cout << "state: " << state << endl;
 }
 
@@ -482 +488 @@
 
    sendMessage(&msgTo, sock, &server);
-   receiveMessage(&msgFrom, sock, &from);
-   processMessage(msgFrom, state, chatConsole);
 }
 
@@ -502 +506 @@
 
    sendMessage(&msgTo, sock, &server);
-   receiveMessage(&msgFrom, sock, &from);
-   processMessage(msgFrom, state, chatConsole);
-}
+}