Merge branch 'master' into SQC19_Booster

SQCSim-common/define.h

@@ -4,8 +4,10 @@
 #include <iostream>
 #include <chrono>
 
-#define SRV_PORT 1025
-#define CLI_PORT 1026
+#define SRV_PORT 10000
+#define CLI_PORT 10001
+
+#define BUFFER_LENGTH 150
 
 #define CHUNK_SIZE_X  4
 #define CHUNK_SIZE_Y  64
@@ -33,6 +35,7 @@
 #define TIME_DAMAGE_BOOST 10	//secondes
 #define TIME_INVINCIBLE_BOOST 4	//secondes
 #define STRENGTH_SPEED_BOOST 10	//Pourcentage
+#define BULLET_TIME .1
 
 typedef uint8_t BlockType;
 typedef uint8_t BoostType;
@@ -49,6 +52,11 @@ typedef uint64_t Timestamp;
 #include <cstdio>
 #include <ctime>
 
+#define flag_t u_long
+#define addrlen_t int
+#define ioctl ioctlsocket
+#define SOCK_NONBLOCK FIONBIO
+#define strcpy strcpy_s
 #define popen _popen
 #define pclose _pclose
 
@@ -58,10 +66,13 @@ typedef uint64_t Timestamp;
 #include <time.h>
 #include <stdio.h>
 #include <sys/socket.h>
+#include <sys/ioctl.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <cstring>
 
+#define flag_t unsigned int
+#define addrlen_t unsigned int
 #define SOCKET int
 #define INVALID_SOCKET -1
 #define closesocket close