Merge branch 'master' into SQC-35_nouvelles_structures
This commit is contained in:
		| @@ -7,7 +7,7 @@ | ||||
| #define SRV_PORT 10000 | ||||
| #define CLI_PORT 10001 | ||||
|  | ||||
| #define BUFFER_LENGTH 150 | ||||
| #define BUFFER_LENGTH 1500 | ||||
|  | ||||
| #define CHUNK_SIZE_X  6 | ||||
| #define CHUNK_SIZE_Y  64 | ||||
| @@ -27,14 +27,22 @@ | ||||
| #define THREADS_UPDATE_CHUNKS 6 | ||||
| #define THREADS_DELETE_CHUNKS 3 | ||||
|  | ||||
| #define VIEW_DISTANCE 512 // Si les chunks arr<72>tent de s'afficher pendant une game et qu'il y a un access violation quand tu quitte, il faut augmenter ce chiffre. | ||||
| #define VIEW_DISTANCE 512 // Si les chunks arr<72>tent de s'afficher pendant une game et qu'il y a un access violation quand tu quitte, il faut augmenter ce chiffre. | ||||
| #define TEXTURE_SIZE 512 | ||||
| #define MAX_BULLETS 512 | ||||
|  | ||||
| #define TIME_SPEED_BOOST 10		//secondes | ||||
| #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; | ||||
| enum BLOCK_TYPE { BTYPE_AIR, BTYPE_DIRT, BTYPE_GRASS, BTYPE_METAL, BTYPE_ICE, BTYPE_GREENGRASS, BTYPE_LAST }; | ||||
| typedef uint8_t BoostType; | ||||
| enum BOOST_TYPE { BTYPE_SPEED, BTYPE_HEAL, BTYPE_DAMAGE, BTYPE_INVINCIBLE, BTYPE_BOOST_LAST }; | ||||
| enum ANIM_TYPE { STILL = 0, SHOOTING = 8, JUMPING = 16, JUMPINGSHOOTING = 24, DEAD = 32, TYPE_LAST = 40}; | ||||
| enum ANIM_POS {FRONT, QUARTER_FRONT_LEFT, QUATER_FRONT_RIGHT, PROFIL_LEFT, PROFIL_RIGHT, QUARTER_BACK_LEFT, QUARTER_BACK_RIGHT, BACK , POS_LAST}; | ||||
| typedef uint64_t Timestamp; | ||||
|  | ||||
| #ifdef _WIN32 | ||||
| @@ -46,6 +54,7 @@ typedef uint64_t Timestamp; | ||||
| #include <cstdio> | ||||
| #include <ctime> | ||||
|  | ||||
| #define poll WSAPoll | ||||
| #define flag_t u_long | ||||
| #define addrlen_t int | ||||
| #define ioctl ioctlsocket | ||||
|   | ||||
		Reference in New Issue
	
	Block a user