Changeset 4c202e0 in network-game for common

Timestamp:

Dec 25, 2012, 6:59:58 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

3b8adee

Parents:

edfd1d0

Message:

Added Player to the visual studio project, changed Common to use the #defines in Compiler.h, and added basic client support for processing MSG_TYPE_PLAYER messages

Location:

common

Files:

• Common.cpp (modified) (1 diff)
• Common.h (modified) (1 diff)
• Player.cpp (modified) (1 diff)
• Player.h (modified) (1 diff)

common/Common.cpp

@@ -3 +3 @@
 void set_nonblock(int sock)
 {
-   #ifdef WIN32
+   #if defined WINDOWS
       unsigned long mode = 1;
       ioctlsocket(sock, FIONBIO, &mode);
-   #else
+   #elif defined LINUX
       int flags;
       flags = fcntl(sock, F_GETFL,0);

common/Common.h

@@ -2 +2 @@
 #define _COMMON_H
 
-#include <fcntl.h>
-#include <assert.h>
+#include "Compiler.h"
+
+#if defined WINDOWS
+   #include <winsock2.h>
+   #include <WS2tcpip.h>
+#elif defined LINUX
+   #include <fcntl.h>
+   #include <assert.h>
+#endif
 
 void set_nonblock(int sock);

common/Player.cpp

@@ -2 +2 @@
 
 #include <iostream>
-#include <arpa/inet.h>
 
 using namespace std;

common/Player.h

@@ -2 +2 @@
 #define _PLAYER_H
 
-#include <netinet/in.h>
+#include "Compiler.h"
+
+#if defined WINDOWS
+   #include <winsock2.h>
+   #include <WS2tcpip.h>
+#elif defined LINUX
+   #include <netinet/in.h>
+#endif
+
 #include <string>