Gossage de musique

SQCSim-common/bullet.cpp

@@ -16,11 +16,9 @@ bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordere
 		for (auto& [key, player] : mapPlayer) {
 			bool hit = false;
 			if ((m_currentpos - player->GetPosition()).Length() < .6f) {
-				std::cout << "hit" << std::endl;
 				hit = true;
 			}
 			if ((m_currentpos - player->GetPOV()).Length() < .2f) {
-				std::cout << "headshot" << std::endl;
 				damage *= 2; // HEADSHOT!
 				hit = true;
 			}
@@ -40,11 +38,10 @@ bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordere
 		else if (world->BlockAt(m_currentpos) != BTYPE_AIR) {
 			if (chunkmod) {
 				using namespace netprot;
-				ChunkMod* cmod = *chunkmod;
-				cmod = new ChunkMod();
-				cmod->old_b_type = world->BlockAt(m_currentpos);
-				cmod->b_type = BTYPE_AIR;
-				cmod->pos = m_currentpos;
+				*chunkmod = new ChunkMod();
+				(*chunkmod)->old_b_type = world->BlockAt(m_currentpos);
+				(*chunkmod)->b_type = BTYPE_AIR;
+				(*chunkmod)->pos = m_currentpos;
 			}
 
 			world->ChangeBlockAtPosition(BTYPE_AIR, m_currentpos);

SQCSim-common/netprotocol.cpp

@@ -29,13 +29,13 @@ void netprot::Serialize(Input* in, char* buf[], uint32_t* buflen) {
 
 	Keys keys = in->keys;
 	uint8_t keys8 = // Reste un bit.
-		(keys.forward? 0b10000000: 0) |
-		(keys.backward? 0b01000000: 0) |
-		(keys.left? 0b00100000: 0) |
-		(keys.right? 0b00010000: 0) |
-		(keys.jump? 0b00001000: 0) |
-		(keys.shoot? 0b00000100: 0) |
-		(keys.block? 0b00000010: 0);
+		(keys.forward ? 0b10000000 : 0) |
+		(keys.backward ? 0b01000000 : 0) |
+		(keys.left ? 0b00100000 : 0) |
+		(keys.right ? 0b00010000 : 0) |
+		(keys.jump ? 0b00001000 : 0) |
+		(keys.shoot ? 0b00000100 : 0) |
+		(keys.block ? 0b00000010 : 0);
 
 	memcpy(*buf + sizeof(uint64_t) * 2 + 1, &keys8, sizeof(uint8_t));
 
@@ -90,14 +90,14 @@ void netprot::Serialize(Output* out, char* buf[], uint32_t* buflen) {
 
 	States states = out->states;
 	uint8_t states8 =
-		(states.jumping? 0b10000000: 0) |
-		(states.shooting? 0b01000000: 0) |
-		(states.hit? 0b00100000: 0) |
-		(states.powerup? 0b00010000: 0) |
-		(states.dead? 0b00001000: 0) |
-		(states.still? 0b00000100: 0) |
-		(states.jumpshot? 0b00000010: 0) |
-		(states.running? 0b00000001: 0);
+		(states.jumping ? 0b10000000 : 0) |
+		(states.shooting ? 0b01000000 : 0) |
+		(states.hit ? 0b00100000 : 0) |
+		(states.powerup ? 0b00010000 : 0) |
+		(states.dead ? 0b00001000 : 0) |
+		(states.still ? 0b00000100 : 0) |
+		(states.jumpshot ? 0b00000010 : 0) |
+		(states.running ? 0b00000001 : 0);
 
 	memcpy(*buf + sizeof(uint64_t) * 2 + 1, &states8, sizeof(uint8_t));
 
@@ -198,18 +198,20 @@ void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
 					(uint8_t)((vec[2] >> 8) & 0xFF),
 					 (uint8_t)(vec[2] & 0xFF) };
 
-	memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t) + 2, vec8, sizeof(uint32_t) * 3);
+	memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t) + 1, vec8, sizeof(uint32_t) * 3);
 
 	uint32_t hp;
 
 	memcpy(&hp, &sync->hp, sizeof(float));
 
-	uint8_t hp8[4] = { 
+	uint8_t hp8[4] = {
 					(uint8_t)((hp >> 24) & 0xFF),
 					(uint8_t)((hp >> 16) & 0xFF),
 					(uint8_t)((hp >> 8) & 0xFF),
 					(uint8_t)(hp & 0xFF) };
 
+	memcpy(*buf + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + 1, hp8, sizeof(float));
+
 	*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + sizeof(float) + 1;
 }
 
@@ -218,7 +220,8 @@ void netprot::Serialize(TeamInfo* tinfo, char* buf[], uint32_t* buflen) {
 
 	size_t namesize = std::strlen(tinfo->name) + 1;
 
-	memcpy(*buf + 1, &tinfo->name, namesize);
+	strcpy(*buf + 1, namesize, tinfo->name);
+
 	uint64_t tid = tinfo->id;
 	uint8_t tid8[sizeof(uint64_t)] = {
 									   (uint8_t)((tid >> 56) & 0xFF),
@@ -241,7 +244,8 @@ void netprot::Serialize(LoginInfo* linfo, char* buf[], uint32_t* buflen) {
 
 	size_t namesize = std::strlen(linfo->name) + 1;
 
-	memcpy(*buf + 1, &linfo->name, namesize);
+	strcpy(*buf + 1, namesize, linfo->name);
+
 	uint64_t sid = linfo->sid;
 	uint8_t sid8[sizeof(uint64_t)] = {
 									   (uint8_t)((sid >> 56) & 0xFF),
@@ -278,7 +282,8 @@ void netprot::Serialize(PlayerInfo* pinfo, char* buf[], uint32_t* buflen) {
 
 	size_t namesize = std::strlen(pinfo->name) + 1;
 
-	memcpy(*buf + 1, &pinfo->name, namesize);
+	strcpy(*buf + 1, namesize, pinfo->name);
+
 	uint64_t id = pinfo->id;
 	uint8_t id8[sizeof(uint64_t)] = {
 									   (uint8_t)((id >> 56) & 0xFF),
@@ -523,7 +528,7 @@ void netprot::Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen) {
 
 
 
-bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(Input* in, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(Input))
 		return false;
 
@@ -538,7 +543,7 @@ bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
 		(uint64_t)diff[5] << 16 |
 		(uint64_t)diff[6] << 8 |
 		(uint64_t)diff[7];
-	
+
 	memcpy(diff, &buf[1 + sizeof(uint64_t)], sizeof(uint64_t));
 	in->sid =
 		(uint64_t)diff[0] << 56 |
@@ -583,7 +588,7 @@ bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(Output* out, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(Output* out, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(Output))
 		return false;
 
@@ -662,7 +667,7 @@ bool netprot::Deserialize(Output* out, char* buf, uint32_t *buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(Sync* sync, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(Sync))
 		return false;
 
@@ -703,7 +708,7 @@ bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
 
 
 	uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
-	memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t)], sizeof(uint8_t) * 12);
+	memcpy(subvec, &buf[1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) + sizeof(uint16_t)], sizeof(uint8_t) * 12);
 	uint32_t vec[3] = {
 		(uint32_t)subvec[0] << 24 |
 		(uint32_t)subvec[1] << 16 |
@@ -722,21 +727,21 @@ bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
 
 	uint8_t hp8[4];
 
-	memcpy(&hp8, &buf[2 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t)], sizeof(uint32_t));
+	memcpy(&hp8, &buf[1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t)], sizeof(uint32_t));
 
 	uint32_t hp = (uint32_t)hp8[0] << 24 |
-				  (uint32_t)hp8[1] << 16 |
-				  (uint32_t)hp8[2] << 8 |
-				  (uint32_t)hp8[3];
+		(uint32_t)hp8[1] << 16 |
+		(uint32_t)hp8[2] << 8 |
+		(uint32_t)hp8[3];
 
 	memcpy(&sync->hp, &hp, sizeof(float));
 
-	*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + sizeof(float);
+	*buflen = 1 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + sizeof(float);
 
 	return true;
 }
 
-bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(LoginInfo))
 		return false;
 
@@ -745,7 +750,7 @@ bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
 	if (namesize > 32)
 		return false;
 
-	memcpy(&tinfo->name, &buf[1], namesize);
+	strcpy(tinfo->name, namesize, &buf[1]);
 
 	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
 	memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));
@@ -764,7 +769,7 @@ bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(LoginInfo))
 		return false;
 
@@ -773,7 +778,7 @@ bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
 	if (namesize > 32)
 		return false;
 
-	memcpy(&linfo->name, &buf[1], namesize);
+	strcpy(linfo->name, namesize, &buf[1]);
 
 	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
 	memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));
@@ -803,7 +808,7 @@ bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(PlayerInfo))
 		return false;
 
@@ -812,7 +817,7 @@ bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
 	if (namesize > 32)
 		return false;
 
-	memcpy(&pinfo->name, &buf[1], namesize);
+	strcpy(pinfo->name, namesize, &buf[1]);
 
 	uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
 	memcpy(diff, &buf[namesize + 1], sizeof(uint64_t));
@@ -842,7 +847,7 @@ bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(GameInfo))
 		return false;
 
@@ -885,7 +890,7 @@ bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t *buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(Chat* chat, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(Chat* chat, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(Chat))
 		return false;
 
@@ -935,7 +940,7 @@ bool netprot::Deserialize(Chat* chat, char* buf, uint32_t *buflen) {
 	strcpy(chat->mess, 140, ciboire);
 
 	//*buflen = messsize + sizeof(uint64_t) * 3 + 1;
-	
+
 	return true;
 }
 
@@ -1037,7 +1042,7 @@ bool netprot::Deserialize(BulletAdd* bull, char* buf, uint32_t* buflen) {
 	return true;
 }
 
-bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t *buflen) {
+bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t* buflen) {
 	if (*buflen <= sizeof(ErrorLog))
 		return false;
 
@@ -1064,7 +1069,7 @@ netprot::PACKET_TYPE netprot::getType(char* buf, const uint32_t buflen) {
 	return (netprot::PACKET_TYPE)buf[0];
 }
 
-netprot::Packet netprot::getPack(char* buf, uint32_t *buflen) {
+netprot::Packet netprot::getPack(char* buf, uint32_t* buflen) {
 	Packet pck = { nullptr, PACKET_TYPE::ERR };
 	Input* in = nullptr;
 	Output* out = nullptr;
@@ -1167,13 +1172,12 @@ netprot::Packet netprot::makePack(void* ptr, PACKET_TYPE type) {
 	return pck;
 }
 
-std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf) {
-	std::vector<char*> lsPck;
-	int len = buf->tmp? buf->tmp - buf->ptr: 0, 
+void netprot::recvPacks(SOCKET sock, Buffer* buf, std::vector<char*>* lsPck) {
+	int len = buf->tmp ? buf->tmp - buf->ptr : 0,
 		end = 0;
-	char * cursor = buf->tmp ? buf->tmp: nullptr ,
-		 * next = buf->tmp ? buf->tmp + 1: buf->ptr, 
-		 * last = buf->tmp ? buf->tmp: buf->ptr;
+	char* cursor = buf->tmp ? buf->tmp : nullptr,
+		* next = buf->tmp ? buf->tmp + 1 : buf->ptr,
+		* last = buf->tmp ? buf->tmp : buf->ptr;
 	bool ended = true;
 	struct pollfd fds[1];
 
@@ -1184,15 +1188,15 @@ std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf)
 		if (!poll(fds, 1, 0)) {
 			if (ended)
 				buf->tmp = nullptr;
-			return lsPck;
+			return;
 		}
-		
+
 		int bytes = recv(sock, &buf->ptr[len], buf->len - len, 0);
 		if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
 			if (ended)
 				buf->tmp = nullptr;
-			return lsPck;
-		} 
+			return;
+		}
 		len += bytes;
 		end = len;
 
@@ -1215,24 +1219,14 @@ std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf)
 
 				cmp = memcmp(cursor, Footer, sizeof(uint32_t));
 				if (cmp == 0) {
-					if (!outbuf) {
-						lsPck.push_back(last);
-						cursor += sizeof(uint32_t);
-						last = cursor;
-						next = cursor + 1;
-					}
-					else {
-						memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
-						lsPck.push_back(&outbuf->ptr[cursor - last]);
-						cursor += sizeof(uint32_t);
-						last = cursor;
-						next = cursor + 1;
-					}
+					lsPck->push_back(last);
+					cursor += sizeof(uint32_t);
+					last = cursor;
+					next = cursor + 1;
 				}
 			}
 			else {
-				if (!outbuf)
-					buf->tmp = last;
+				buf->tmp = last;
 				cursor = &buf->ptr[len];
 				next = cursor + 1;
 				break;
@@ -1241,8 +1235,7 @@ std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf)
 	}
 }
 
-std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* outbuf) {
-	std::vector<char*> lsPck;
+void netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, std::vector<char*>* lsPck) {
 	int len = buf->tmp ? buf->tmp - buf->ptr : 0,
 		end = 0;
 	char* cursor = buf->tmp ? buf->tmp : nullptr,
@@ -1260,14 +1253,14 @@ std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in
 		if (!poll(fds, 1, 0)) {
 			if (ended)
 				buf->tmp = nullptr;
-			return lsPck;
+			return;
 		}
 
 		int bytes = recvfrom(sock, &buf->ptr[len], buf->len - len, 0, (sockaddr*)&sockad, &socklen);
 		if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
 			if (ended)
 				buf->tmp = nullptr;
-			return lsPck;
+			return;
 		}
 		len += bytes;
 		end = len;
@@ -1291,24 +1284,14 @@ std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in
 
 				cmp = memcmp(cursor, Footer, sizeof(uint32_t));
 				if (cmp == 0) {
-					if (!outbuf) {
-						lsPck.push_back(last);
-						cursor += sizeof(uint32_t);
-						last = cursor;
-						next = cursor + 1;
-					}
-					else {
-						memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
-						lsPck.push_back(&outbuf->ptr[cursor - last]);
-						cursor += sizeof(uint32_t);
-						last = cursor;
-						next = cursor + 1;
-					}
+					lsPck->push_back(last);
+					cursor += sizeof(uint32_t);
+					last = cursor;
+					next = cursor + 1;
 				}
 			}
 			else {
-				if (!outbuf)
-					buf->tmp = last;
+				buf->tmp = last;
 				cursor = &buf->ptr[len];
 				next = cursor + 1;
 				break;

SQCSim-common/netprotocol.h

@@ -19,7 +19,7 @@ namespace netprot {
 	/* Structures */
 	
 	struct Buffer { // Pour pouvoir rendre l'utilisation des buffers plus clean.
-		char* ptr = new char[BUFFER_LENGTH] { 1 }, * tmp = nullptr;
+		char *ptr = new char[BUFFER_LENGTH] { 1 }, *tmp = nullptr;
 		uint32_t len = BUFFER_LENGTH;
 
 		~Buffer() { delete[] ptr; }
@@ -27,7 +27,7 @@ namespace netprot {
 	};
 
 	struct Packet { // Pour pouvoir recevoir les paquets du recv() sans avoir à les aiguiller dans la même thread.
-		void* ptr = nullptr; // Notez que le pointeur doit être supprimé séparément lorsqu'il n'est plus utile.
+		void *ptr = nullptr; // Notez que le pointeur doit être supprimé séparément lorsqu'il n'est plus utile.
 		PACKET_TYPE type = PACKET_TYPE::ERR;
 	};
 
@@ -87,30 +87,30 @@ namespace netprot {
 	};
 
 	struct TeamInfo {									// cli <-> srv			TCP			once
-		char name[32];
+		char *name = new char[32];
 		uint64_t id = 0;
 		TeamInfo() {}
-		TeamInfo(TeamInfo* tem) : id(tem->id) { strcpy(tem->name, name); }
+		TeamInfo(TeamInfo* tem) : id(tem->id) { strcpy(name, 32, tem->name); }
+		~TeamInfo() { delete[] name; }
 	};
 
 	struct LoginInfo {									// cli <-> srv			TCP			once
-		char name[32];
+		char *name = new char[32];
 		uint64_t sid = 0, 
 			     tid = 0;
 		LoginInfo() {}
-		LoginInfo(LoginInfo* ply): sid(ply->sid), tid(ply->tid) { strcpy(ply->name, name); }
+		LoginInfo(LoginInfo* log): sid(log->sid), tid(log->tid) { strcpy(name, 32, log->name); }
+		~LoginInfo() { delete[] name; }
 	};
 
 	struct PlayerInfo {									// cli <-> srv			TCP			once
-		char name[32];
+		char *name = new char[32];
 		uint64_t id = 0,
 				 tid = 0;
 		PlayerInfo() {}
-		PlayerInfo(PlayerInfo* log) : id(log->id), tid(log->tid) {
-			strcpy(log->name, name);
-		};
-		PlayerInfo(int id, int tid, std::string strname) : id(id), tid(tid) { memcpy((void*)strname.c_str(), name, strname.length());
-		}
+		PlayerInfo(PlayerInfo* ply) : id(ply->id), tid(ply->tid) { strcpy(name, 32, ply->name); };
+		PlayerInfo(int id, int tid, std::string strname) : id(id), tid(tid) { strcpy(name, 32, strname.c_str()); }
+		~PlayerInfo() { delete[] name; }
 	};
 
 	struct GameInfo {									// cli <-> srv			TCP			event (before game start)/ once
@@ -125,11 +125,10 @@ namespace netprot {
 		uint64_t src_id = 0,
 			dest_id = 0,
 			dest_team_id = 0;
-		char* mess = new char[140]; // Good 'nough for twitr, good 'nough for me.
+		char *mess = new char[140]; // Good 'nough for twitr, good 'nough for me.
 		Chat() {}
-		Chat(Chat* cha) : src_id(cha->src_id), dest_id(cha->dest_id), dest_team_id(cha->dest_team_id) { 
-			strcpy(mess, 140, cha->mess); }
-		~Chat() {/* delete[] mess; */}
+		Chat(Chat* cha) : src_id(cha->src_id), dest_id(cha->dest_id), dest_team_id(cha->dest_team_id) { strcpy(mess, 140, cha->mess); }
+		~Chat() { delete[] mess; }
 	};
 
 	struct ChunkMod {
@@ -144,10 +143,11 @@ namespace netprot {
 	};
 
 	struct ErrorLog {									// srv -> cli			TCP			event
-		char mess[140];
-		bool is_fatal;
+		char *mess = new char[140];
+		bool is_fatal = false;
 		ErrorLog() {};
-		ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(err->mess, mess); }
+		ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(mess, 140, err->mess); }
+		~ErrorLog() { delete[] mess; }
 	};
 
 	/* Fonctions */
@@ -193,8 +193,8 @@ namespace netprot {
 	template <class T> void sendPack(SOCKET sock, T* pack, Buffer* buf);
 	template <class T> void sendPackTo(SOCKET sock, T* pack, Buffer* buf, sockaddr_in* sockad);
 	
-	std::vector<char*> recvPacks(SOCKET sock, Buffer* buf, Buffer* oufbuf = nullptr);
-	std::vector<char*> recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* oufbuf = nullptr);
+	void recvPacks(SOCKET sock, Buffer* buf, std::vector<char*>* lsPck);
+	void recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, std::vector<char*>* lsPck);
 
 	/* Templates */
 

SQCSim-srv/connection.cpp

@@ -4,16 +4,18 @@
 
 Connection::Connection(SOCKET sock,
 	sockaddr_in sockaddr,
-	LoginInfo log,
-	PlayerInfo play) :
+	LoginInfo *log,
+	PlayerInfo *play) :
 	m_sock(sock),
 	m_addr(sockaddr),
-	m_loginfo(log),
-	m_playinfo(play) {
+	m_loginfo(*log),
+	m_playinfo(*play) {
 
 }
 
-Connection::~Connection() { closesocket(m_sock); }
+Connection::~Connection() { 
+	delete player;
+	closesocket(m_sock); }
 
 uint64_t Connection::GetHash(bool self) const { return self ? m_loginfo.sid : m_playinfo.id; }
 
@@ -51,7 +53,7 @@ void Connection::getPacks(SOCKET sock) {
 	std::vector<char*> lsPck;
 	Input in;
 	Sync sync;
-	lsPck = recvPacksFrom(sock, &m_buf, m_addr);
+	recvPacksFrom(sock, &m_buf, m_addr, &lsPck);
 	for (auto& pck : lsPck) {
 		uint32_t bsize = m_buf.len - (pck - m_buf.ptr);
 		switch (netprot::getType(pck, 1)) {
@@ -144,7 +146,7 @@ Timestamp Connection::Run(World* world) {
 			player->Killer = GetHash(true);
 		}
 
-		out.states.jumping = player->GetIsAirborne(); //abs(player->GetVelocity().y) > .2f;
+		out.states.jumping = player->GetIsAirborne();
 		out.states.running = player->GetVelocity().Length() > .5f;
 		out.states.still = !out.states.running && !out.states.jumping;
 		out.states.hit = player->m_hit;
@@ -166,7 +168,7 @@ Timestamp Connection::Run(World* world) {
 					player->GetDirection(),
 					block, true);
 				if (cmod)
-					ChunkDiffs.emplace_back(cmod);
+					ChunkDiffs.push_back(std::move(cmod));
 			}
 		}
 		else toggle = false;
@@ -178,7 +180,7 @@ Timestamp Connection::Run(World* world) {
 		else out.states.jumpshot = false;
 
 		if (in.keys.shoot && m_shoot_acc <= 0.) {
-			Bullets.emplace_back(new Bullet(player->GetPOV() + player->GetDirection(), player->GetDirection(), GetHash(true)));
+			Bullets.push_back(std::move(new Bullet(player->GetPOV() + player->GetDirection(), player->GetDirection(), GetHash(true))));
 			m_shoot_acc = BULLET_TIME;
 		}
 

SQCSim-srv/connection.h

@@ -16,8 +16,8 @@ public:
 	Connection(
 		SOCKET sock,
 		sockaddr_in sockaddr,
-		LoginInfo log,
-		PlayerInfo play);
+		LoginInfo *log,
+		PlayerInfo *play);
 	~Connection();
 
 	Player* player = nullptr;

SQCSim-srv/main.cpp

@@ -3,6 +3,11 @@
 int main() {
 	std::unique_ptr<Server> server = std::make_unique<Server>();
 	if (server->Init() == 0)
-		if (server->Ready() == 0)
+		while (server->Ready() == 0) {
 			server->Run();
+			if (!server->NewGameRequested())
+				break;
+			server->Cleanup();
+		}
+	server->DeInit();
 }

SQCSim-srv/server.cpp

@@ -132,7 +132,7 @@ int Server::Ready() {
 			str.append(inet_ntop(AF_INET, &sockad.sin_addr, m_buf.ptr, m_buf.len)).append(": ").append(std::to_string(sockad.sin_port));
 
 			if (recv(sock, m_buf.ptr, m_buf.len, 0) > 0) {
-				PlayerInfo play;
+				PlayerInfo* play = new PlayerInfo();
 
 				m_buf.len = BUFFER_LENGTH;
 				Packet pck = getPack(&m_buf);
@@ -153,23 +153,20 @@ int Server::Ready() {
 
 				sendPackTo<LoginInfo>(m_sock_udp, log, &m_buf, &sockad);
 
-				play.id = getUniqueId();
-				play.tid = log->tid;
-				strcpy(play.name, log->name);
+				play->id = getUniqueId();
+				play->tid = log->tid;
+				strcpy(play->name, 32, log->name);
 
-				Log(str.append(play.name).append(" SID: [").append(std::to_string(log->sid)).append("]")
-					.append(" ID: [").append(std::to_string(play.id)).append("]")
-					.append(" TID: [").append(std::to_string(play.tid)).append("]"), false, false);
-				play.tid = log->tid;
+				Log(str.append(play->name).append(" SID: [").append(std::to_string(log->sid)).append("]")
+					.append(" ID: [").append(std::to_string(play->id)).append("]")
+					.append(" TID: [").append(std::to_string(play->tid)).append("]"), false, false);
+				play->tid = log->tid;
 
 				sendPackTo<GameInfo>(m_sock_udp, &m_game, &m_buf, &sockad);
-				std::cout << m_game.seed << std::endl;
-				Connection* conn = new Connection(sock, sockad, *log, play);
+				Connection* conn = new Connection(sock, sockad, log, play);
 
 				m_conns[log->sid] = conn;
 
-				delete log;
-
 				if (++nbrconn >= nbrjoueurs)
 					readystart = true;
 			}
@@ -201,8 +198,12 @@ void Server::Run() {
 	m_world->BuildWorld();
 
 	for (auto& [key, conn] : m_conns) { // Creation des instances de joueurs et premier sync.
-		int x = 0,// (rand() % (CHUNK_SIZE_X * WORLD_SIZE_X - 1)),// -(CHUNK_SIZE_X * WORLD_SIZE_X / 2),
-			y = 0;// (rand() % (CHUNK_SIZE_Y * WORLD_SIZE_Y - 1));// -(CHUNK_SIZE_Y * WORLD_SIZE_Y / 2);
+		if (!conn) {
+			m_conns.erase(key);
+			continue;
+		}
+		int x = (rand() % (CHUNK_SIZE_X * WORLD_SIZE_X - 1) - (CHUNK_SIZE_X * WORLD_SIZE_X / 2)) / 8,
+			y = (rand() % (CHUNK_SIZE_Y * WORLD_SIZE_Y - 1) - (CHUNK_SIZE_Y * WORLD_SIZE_Y / 2)) / 8;
 		conn->player = new Player(Vector3f(x + .5f, CHUNK_SIZE_Y + 1.8f, y + .5f));
 		conn->player->m_username = conn->GetName();
 		m_players[key] = conn->player;
@@ -221,12 +222,14 @@ void Server::Run() {
 	Timestamp last = 0;
 	std::vector<Chat*> chatlog;
 	std::vector<ChunkMod*> chunkdiffs;
-	std::vector<Bullet*> bullets, outbox_bullets;
+	std::vector<Bullet*> bullets;
+	std::vector<std::vector<Bullet*>::iterator> bullit;
 	std::vector<BulletAdd*> netbull;
+	std::vector<char*> lsPck;
 
 	Chat* startchat = new Chat();
 	startchat->src_id = 0;
-	char startmess[] = "How would -YOU- like to die today, motherfuckers?";
+	char startmess[] = "How would -YOU- like to die today, motherf-words?";
 
 	strcpy(startchat->mess, 140, startmess);
 
@@ -248,29 +251,27 @@ void Server::Run() {
 		}
 		last = tstamp;
 
-		for (auto& [key, conn] : m_conns) {
+
+		for (auto& [key, conn] : m_conns) {				
 
 			/* In */
 
-			std::vector<char*> lsPck;
-			Input in; Chat chat; Sync sync;
+			Input in; Sync sync;
 
-			lsPck = recvPacks(m_sock_udp, &m_buf);
+			recvPacks(m_sock_udp, &m_buf, &lsPck);
 			for (auto& pck : lsPck) {
 				uint32_t bsize = m_buf.len - (pck - m_buf.ptr);
 				switch (netprot::getType(pck, 1)) {
 					using enum netprot::PACKET_TYPE;
 				case INPUT:
-					if (Deserialize(&in, pck, &bsize))
-						m_conns[in.sid]->AddInput(in);
+					if (Deserialize(&in, pck, &bsize)) {
+						if (m_conns.count(in.sid))
+							m_conns[in.sid]->AddInput(in);
+					}
 					break;
 				case SYNC:
 					if (Deserialize(&sync, pck, &bsize)) {}
 					break;
-				case CHAT:
-					//if (Deserialize(&chat, pck, &bsize))
-						//chatlog.push_back(chat);
-					break;
 				default: break;
 				}
 			}
@@ -301,7 +302,7 @@ void Server::Run() {
 
 					for (auto& bull : conn->Bullets) {
 						bullets.emplace_back(bull);
-						Log("POW!", false, false);
+						//Log("POW!", false, false);
 						BulletAdd* nbul = new BulletAdd();
 						nbul->pos = bull->getPos();
 						nbul->dir = bull->getVel();
@@ -327,17 +328,21 @@ void Server::Run() {
 					sendPackTo<BulletAdd>(m_sock_udp, bull, &m_buf, conn->getAddr());
 			delete bull;
 		}
-				
-
-		for (auto& bull : bullets) {
+		netbull.clear();
+		
+		for (auto bull = bullets.begin(); bull != bullets.end(); ++bull) {
 			ChunkMod* cmod = nullptr;
-			if (bull->Update(m_world, (1. / 60.), 20, m_players, &cmod)) {
+			Bullet* bullet = *bull;
+			if (bullet->Update(m_world, (1. / 60.), 20, m_players, &cmod)) {
 				if (cmod)
-					chunkdiffs.emplace_back(std::move(cmod));
-				outbox_bullets.emplace_back(std::move(bull));
+					chunkdiffs.emplace_back(cmod);
+				bullit.push_back(bull);
+				delete bullet;
 			}
 		}
-		netbull.clear();
+		for (auto& bull: bullit)
+			bullets.erase(bull);
+		bullit.clear();
 
 		for (auto& chat : chatlog) {
 				Log(chat->mess, false, false);
@@ -353,25 +358,61 @@ void Server::Run() {
 			delete chmo;
 		}
 		chunkdiffs.clear();
-		
-		for (auto& bull : outbox_bullets)
-			delete bull;
-		outbox_bullets.clear();
 	}
 
 	Chat end;
 	end.src_id = 0;
 	char endmess[] = "Game over, man. Game over.";
-
 	strcpy(end.mess, 140, endmess);
 
+	for (auto& [key, conn] : m_conns) {
+		std::string str = conn->player->GetUsername();
+		Log(str.append(" ").append(std::to_string(conn->player->GetHP())), false, false);
+		
+	}
+
 	for (auto& [key, conn] : m_conns)
 		sendPackTo<Chat>(m_sock_udp, &end, &m_buf, conn->getAddr());
 
 	// TODO: Gérer les 2-3 secondes post-game avant le billboard pour pas avoir un whiplash à la fin de la game.
-	system("pause");
+
+	char* ch = new char[2];
+	std::cout << "Nouvelle partie? [o/N] ";
+	std::cin.getline(ch, 2);
+	std::cout << std::endl;
+
+	m_exit = true;
+	if (ch[0] == 'o' || ch[0] == 'O')
+		m_exit = false;
+
+	delete[] ch;
 }
 
+void Server::Cleanup() {
+	for (auto& [key, conn] : m_conns)
+		delete conn;
+	
+	m_conns.clear();
+	m_players.clear();
+	delete m_world;
+	m_world = nullptr;
+}
+
+void Server::DeInit() {
+	if (m_logfile.is_open())
+		m_logfile.close();
+	if (m_sock_udp)
+		closesocket(m_sock_udp);
+	if (m_sock_tcp)
+		closesocket(m_sock_tcp);
+
+#ifdef _WIN32
+	WSACleanup();
+#endif
+}
+
+bool Server::NewGameRequested() const { return !m_exit; }
+
 inline std::string Server::LogTimestamp() {
 	time_t rawtime;
 	tm timeinfo;
@@ -452,7 +493,7 @@ std::string Server::getDeathMessage(std::string username, std::string killer) co
 		mess.append(temp.substr(0, ind));
 		mess.append(username);
 		if (!bypass) {
-			mess.append(temp.substr(ind + 1, indk));
+			mess.append(temp.substr(ind + 1, indk - 1));
 			mess.append(killer);
 			mess.append(temp.substr(indk + 1));
 		}
@@ -461,7 +502,7 @@ std::string Server::getDeathMessage(std::string username, std::string killer) co
 	else {
 		mess.append(temp.substr(0, indk));
 		mess.append(killer);
-		mess.append(temp.substr(indk + 1, ind));
+		mess.append(temp.substr(indk + 1, ind - 1));
 		mess.append(username);
 		mess.append(temp.substr(ind + 1));
 	}

SQCSim-srv/server.h

@@ -24,6 +24,9 @@ public:
 	int Init();
 	int Ready();
 	void Run();
+	void Cleanup();
+	void DeInit();
+	bool NewGameRequested() const;
 
 private:
 
@@ -44,7 +47,7 @@ private:
 	GameInfo m_game;
 
 	World* m_world = nullptr;
-	const bool m_manual_setup = SRV_MANUAL_SETUP;
+	bool m_exit = true;
 
 	std::string LogTimestamp();
 	void Log(std::string str, bool is_error, bool is_fatal);

SQCSim2021/audio.cpp

@@ -14,7 +14,7 @@ Audio::Audio(const char * music) {
 	m_engine->setRolloffFactor(2);
 	m_engine->setDefault3DSoundMinDistance(.1);
 	m_engine->setDefault3DSoundMaxDistance(1000);
-	m_music = m_engine->play2D(music, false, true, true, irrklang::ESM_STREAMING);
+	m_music = m_engine->play2D(music, true, true, true, irrklang::ESM_STREAMING);
 }
 
 Audio::~Audio() { 

SQCSim2021/connector.cpp

@@ -65,7 +65,7 @@ int Connector::Connect(const char* srv_addr, std::string name) {
 
 	netprot::Buffer bf;
 	netprot::LoginInfo log;
-	strcpy(log.name, name.c_str());
+	strcpy(log.name, 32, name.c_str());
 
 	netprot::sendPack(m_sock_tcp, &log, &bf);
 
@@ -73,7 +73,7 @@ int Connector::Connect(const char* srv_addr, std::string name) {
 	int errors = 0;
 	std::vector<char*> lsPck;
 	while (!ready) {
-		lsPck = netprot::recvPacks(m_sock_udp, &bf);
+		netprot::recvPacks(m_sock_udp, &bf, &lsPck);
 
 		for (auto& pck : lsPck) {
 			uint32_t bsize = bf.len - (pck - bf.ptr);
@@ -94,6 +94,7 @@ int Connector::Connect(const char* srv_addr, std::string name) {
 					++errors;
 				else {
 					m_players[pl->id] = pl;
+					std::cout << "A challenger appears! " << pl->name << std::endl;
 				}
 				break;
 			case TEAMINF:

SQCSim2021/define.h

@@ -48,8 +48,9 @@
 enum GameState { 
 	MAIN_MENU, 
 	SPLASH,
+	LOBBY,
 	OPTIONS,
-	QUIT, 
+	QUIT,
 	PLAY, 
 	PAUSE
 };

SQCSim2021/engine.cpp

@@ -18,7 +18,7 @@ struct Notification {
 // Use a vector to manage notifications
 std::vector<Notification> notifications;
 
-Engine::Engine() : m_remotePlayer(&m_pinfo), m_pinfo() {}
+Engine::Engine() {}
 
 Engine::~Engine() {
 	m_world.CleanUpWorld(m_renderCount, true);
@@ -29,9 +29,6 @@ Engine::~Engine() {
 }
 
 void Engine::Init() {
-
-	uint64_t seed = SEED;
-
 	if (m_istarted)
 		return;
 	else m_istarted = true;
@@ -39,74 +36,16 @@ void Engine::Init() {
 	// Objet de skybox avec sa propre texture et son propre shader!
 	m_skybox.Init(0.2f);
 	// Objet de musique!
-	//m_audio.ToggleMusicState();
-
+	//m_menuaudio.ToggleMusicState();
+	
 	// Array pour les balles.
 	for (int x = 0; x < MAX_BULLETS; ++x) {
 		m_bullets[x] = nullptr;
 		m_whoosh[x] = nullptr;
 	}
 
-	// Init Chunks
 	m_world.GetChunks().Reset(nullptr);
-
-	char* ch = new char[2];
-
-	std::cout << "Jouer en ligne? [o/N] ";
-	std::cin.getline(ch, 2);
-	std::cout << std::endl;
-
-	if (*ch == 'o' || *ch == 'O') {
-		char* input = new char[32];
-		std::string playname, srvname;
-
-		while (playname.size() < 1) {
-			std::cout << "Veuillez entrer un nom de joueur: ";
-			std::cin.getline(input, 32);
-			std::cout << std::endl;
-			playname = input;
-			if (playname.size() < 1 || playname.size() > 32)
-				std::puts("Nom invalide.");
-		}
-		while (srvname.size() < 1) {
-			std::cout << "Veuillez entrer une adresse de serveur: ";
-			std::cin.getline(input, 32);
-			std::cout << std::endl;
-			srvname = input;
-			if (srvname.size() < 1 || srvname.size() > 32)
-				std::puts("Adresse serveur invalide.");
-		}
-		delete[] input;
-
-		if (!m_conn.Init()) {
-			if (!m_conn.Connect(srvname.c_str(), playname)) {
-				// setup jeu en reseau.
-				std::cout << "ID recu du serveur: " << std::to_string(m_conn.getId()) << "!" << std::endl;
-				//std::cout << "Seed recu du serveur: " << std::to_string(m_conn.getSeed()) << "!" << std::endl;
-				m_player = Player(m_conn.getOrigin().position);
-
-				for (auto& [key, player] : m_conn.m_players) {
-					m_players[key] = new RemotePlayer(player);
-					RemotePlayer* rt = (RemotePlayer*)m_players[key];
-					rt->SetPosition(Vector3f(555, 555, 555));
-				}
-				m_player.m_username = playname;
-				seed = 9370707;//m_conn.getSeed();
-				m_networkgame = true;
-			}
-			else std::cout << "Erreur de connexion." << std::endl;
-		}
-		else std::cout << "Erreur de creation de socket." << std::endl;
-	}
-	delete[] ch;
-
-	m_world.SetSeed(seed);
-
-	m_startTime = std::chrono::high_resolution_clock::now();
-	m_remotePlayer.SetPosition(Vector3f(.5, CHUNK_SIZE_Y + 10., .5));
-	// Gestion de souris.
-	CenterMouse();
-	HideCursor();
+	m_world.SetSeed(SEED);
 }
 
 void Engine::DeInit() {}
@@ -143,8 +82,9 @@ void Engine::LoadResource() {
 	LoadTexture(m_textureGun, TEXTURE_PATH "gun01.png", false);
 	LoadTexture(m_texturePovGun, TEXTURE_PATH "GUN.png", false);
 
+	LoadTexture(m_textureLobbyMenu, TEXTURE_PATH "menus/backgrounds/bgLobby.png", false);
 	LoadTexture(m_textureMainMenu, TEXTURE_PATH "menus/backgrounds/bgMainMenu.png", false);
-	LoadTexture(m_texturePauseMenu, TEXTURE_PATH "menus/backgrounds/bgPause.png", false);
+	//LoadTexture(m_texturePauseMenu, TEXTURE_PATH "menus/backgrounds/bgPause.png", false);
 	LoadTexture(m_textureOptionsMenu, TEXTURE_PATH "menus/backgrounds/bgOptions.png", false);
 	LoadTexture(m_textureSplashScreen, TEXTURE_PATH "menus/backgrounds/bgSplash.png", false);
 
@@ -162,6 +102,9 @@ void Engine::LoadResource() {
 	LoadTexture(m_textureOptSensitivity, TEXTURE_PATH "menus/buttons/options/optSensitivity.png", false);
 	LoadTexture(m_textureOptSfx, TEXTURE_PATH "menus/buttons/options/optSfx.png", false);
 
+	LoadTexture(m_textureLobbyServer, TEXTURE_PATH "menus/labels/labelServer.png", false);
+	LoadTexture(m_textureLobbyIdentify, TEXTURE_PATH "menus/labels/labelIdentify.png", false);
+	LoadTexture(m_textureHd, TEXTURE_PATH "menus/labels/labelHd.png", false);
 	LoadTexture(m_textureHd, TEXTURE_PATH "menus/labels/labelHd.png", false);
 	LoadTexture(m_textureFhd, TEXTURE_PATH "menus/labels/labelFhd.png", false);
 	LoadTexture(m_textureQhd, TEXTURE_PATH "menus/labels/labelQhd.png", false);
@@ -602,14 +545,10 @@ void Engine::DisplayPovGun() {
 	glLoadIdentity();
 	glTranslated(xTranslation, 0, 0);
 	glBegin(GL_QUADS);
-	glTexCoord2f(0, 0);
-	glVertex2i(0, 0);
-	glTexCoord2f(1, 0);
-	glVertex2i(quadWidth, 0);
-	glTexCoord2f(1, 1);
-	glVertex2i(quadWidth, quadHeight);
-	glTexCoord2f(0, 1);
-	glVertex2i(0, quadHeight);
+	glTexCoord2f(0, 0);		glVertex2i(0, 0);
+	glTexCoord2f(1, 0);		glVertex2i(quadWidth, 0);
+	glTexCoord2f(1, 1);		glVertex2i(quadWidth, quadHeight);
+	glTexCoord2f(0, 1);		glVertex2i(0, quadHeight);
 	glEnd();
 
 	// Reset du blend function
@@ -666,6 +605,34 @@ int Engine::GetOptionsChoice() {
 	return m_selectedOption;
 }
 
+bool Engine::StartMultiplayerGame() {
+	bool ok = true;
+	if (!m_conn.Init()) {
+		if (!m_conn.Connect(m_serverAddr.c_str(), m_username)) {
+			// setup jeu en reseau.
+			std::cout << "ID recu du serveur: " << std::to_string(m_conn.getId()) << "!" << std::endl;
+			std::cout << "Seed recu du serveur: " << std::to_string(m_conn.getSeed()) << "!" << std::endl;
+			m_player = Player(m_conn.getOrigin().position);
+
+			for (auto& [key, player] : m_conn.m_players)
+				m_players[key] = new RemotePlayer(player);
+
+			//m_world.SetSeed(m_conn.getSeed());
+			m_world.SetSeed(9370707);
+			m_networkgame = true;
+		}
+		else {
+			std::cout << "Erreur de connexion." << std::endl;
+			ok = false;
+		}
+	}
+	else {
+		std::cout << "Erreur de creation de socket." << std::endl;
+		ok = false;
+	}
+	return ok;
+}
+
 void Engine::DisplayInfo(float elapsedTime, BlockType bloc) {
 	m_textureFont.Bind();
 	std::ostringstream ss;
@@ -751,15 +718,81 @@ void Engine::DisplaySplashScreen() {
 	glPopMatrix();
 }
 
-void Engine::DisplayPauseMenu() {
+void Engine::DisplayLobbyMenu(float elapsedTime) {
 
-	m_texturePauseMenu.Bind();
+	GLint viewport[4];
+	glGetIntegerv(GL_VIEWPORT, viewport);
+
+	glDisable(GL_DEPTH_TEST);
+	glEnable(GL_BLEND);
+
+	glMatrixMode(GL_PROJECTION);
+	glPushMatrix();
+
+	glLoadIdentity();
+	glOrtho(0, Width(), 0, Height(), -1, 1);
+
+	glMatrixMode(GL_MODELVIEW);
+	glPushMatrix();
+
+	m_textureLobbyMenu.Bind();
 	glBegin(GL_QUADS);
-	glTexCoord2f(0, 0);	glVertex2i(0, 0);
-	glTexCoord2f(1, 0);	glVertex2i(Width(), 0);
-	glTexCoord2f(1, 1);	glVertex2i(Width(), Height());
+	glTexCoord2f(0, 0); glVertex2i(0, 0);
+	glTexCoord2f(1, 0); glVertex2i(Width(), 0);
+	glTexCoord2f(1, 1); glVertex2i(Width(), Height());
 	glTexCoord2f(0, 1); glVertex2i(0, Height());
 	glEnd();
+
+	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+
+	if (m_settingUsername) {
+		SetPlayerUsername(elapsedTime);
+	}
+	else if (m_settingServer) {
+		SetServerAddress(elapsedTime);
+	}
+
+	glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
+
+	glEnable(GL_DEPTH_TEST);
+
+	glMatrixMode(GL_PROJECTION);
+	glPopMatrix();
+
+	glMatrixMode(GL_MODELVIEW);
+	glPopMatrix();
+}
+
+void Engine::SetPlayerUsername(float elapsedTime) {
+	m_textureLobbyIdentify.Bind();
+	glBegin(GL_QUADS);
+	glTexCoord2f(0, 0); glVertex2i(Width() * 0.6, Height() * 0.75);
+	glTexCoord2f(1, 0); glVertex2i(Width() * 0.975, Height() * 0.75);
+	glTexCoord2f(1, 1); glVertex2i(Width() * 0.975, Height() * 0.95);
+	glTexCoord2f(0, 1); glVertex2i(Width() * 0.6, Height() * 0.95);
+	glEnd();
+
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+	HandlePlayerInput(elapsedTime);
+	glDisable(GL_BLEND);
+
+	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+}
+
+void Engine::SetServerAddress(float elapsedTime) {
+	m_textureLobbyServer.Bind();
+	glBegin(GL_QUADS);
+	glTexCoord2f(0, 0); glVertex2i(Width() * 0.6, Height() * 0.75);
+	glTexCoord2f(1, 0); glVertex2i(Width() * 0.975, Height() * 0.75);
+	glTexCoord2f(1, 1); glVertex2i(Width() * 0.975, Height() * 0.95);
+	glTexCoord2f(0, 1); glVertex2i(Width() * 0.6, Height() * 0.95);
+	glEnd();
+
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+	HandlePlayerInput(elapsedTime);
+	glDisable(GL_BLEND);
+
+	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 }
 
 void Engine::DisplayMainMenu() {
@@ -1197,14 +1230,27 @@ void Engine::Render(float elapsedTime) {
 		return;
 	}
 
-	if (m_gamestate == GameState::PAUSE) {
-		DisplayPauseMenu();
+	if (m_gamestate == GameState::LOBBY) {
+		DisplayLobbyMenu(elapsedTime);
+		if (m_multiReady) {
+			if (StartMultiplayerGame()) {
+				std::cout << "Starting multiplayer game reached" << std::endl;
+				m_gamestate = GameState::PLAY;
+				//m_menuaudio.ToggleMusicState();
+				m_audio.ToggleMusicState();
+				m_startTime = std::chrono::high_resolution_clock::now();
+			}
+			else {
+				std::cout << "Cannot reach server." << std::endl;
+				m_gamestate = GameState::MAIN_MENU;
+			}
+		}
 		return;
 	}
 
 	if (m_gamestate == GameState::PLAY) {
 		HideCursor();
-		CenterMouse(); //D<>placement de centermouse dans l'action de jouer
+		CenterMouse();
 
 		static irrklang::ISound* step; // Pour les sons de pas.
 		static float pollTime = 0;
@@ -1258,7 +1304,7 @@ void Engine::Render(float elapsedTime) {
 
 		m_mouseWU = m_mouseWD = m_key1 = m_key2 = false;
 		netprot::ChunkMod* cmod = nullptr;
-		if (m_mouseL) {
+		if (!m_player.AmIDead() && m_mouseL) {
 			if (bulletTime <= 0.f) {
 				for (int x = 0; x < MAX_BULLETS; ++x)  // Ajouter une balle dans l'array (aussi connu sous le nom de "faire pow pow").
 					if (!m_bullets[x]) {
@@ -1282,14 +1328,20 @@ void Engine::Render(float elapsedTime) {
 		else if (m_mouseR)
 			cmod = m_world.ChangeBlockAtCursor(BTYPE_METAL, m_player.GetPosition(), m_player.GetDirection(), m_block, m_networkgame);
 
+		static netprot::ChunkMod** wat = &m_chunkmod;
 		for (int x = 0; x < MAX_BULLETS; ++x) { // Array de bullets en jeu.
 			if (m_bullets[x]) {
 				for (int b = 0; b < BULLET_UPDATES_PER_FRAME; ++b) {
-					if (m_bullets[x]->Update(&m_world, elapsedTime, BULLET_UPDATES_PER_FRAME, m_players, m_networkgame ? &m_chunkmod : nullptr)) {
+					if (m_bullets[x]->Update(&m_world, elapsedTime, BULLET_UPDATES_PER_FRAME, m_players, m_networkgame ? wat : nullptr)) {
 						m_bullets[x]->~Bullet();
+
+						if (m_chunkmod) {
+							m_chunkmod_manifest.push_back(std::move(m_chunkmod));
+							m_chunkmod = nullptr;
+						}
+						m_bullets[x] = nullptr;
 						//if (m_whoosh[x])
 						//	m_whoosh[x]->drop();
-						//m_bullets[x] = nullptr;
 						//m_whoosh[x] = nullptr;
 						break;
 					}
@@ -1324,7 +1376,7 @@ void Engine::Render(float elapsedTime) {
 			std::string user = m_player.m_username.append(" (Dead)");
 			m_player = Player(Vector3f(.5, CHUNK_SIZE_Y + 1.7f, .5), 0, 0);
 			m_player.m_username = user;
-
+			m_player.InflictDamage(-m_player.GetHP());
 		}
 
 		m_time += elapsedTime;
@@ -1349,6 +1401,7 @@ void Engine::Render(float elapsedTime) {
 
 			sync_acc += tstamp - last;
 			cmod_acc += tstamp - last;
+			last = tstamp;
 
 			if (sync_acc >= 1000) {
 				sync_acc -= 1000;
@@ -1363,9 +1416,9 @@ void Engine::Render(float elapsedTime) {
 				m_syncs[sync.timestamp] = sync;
 			}
 
-			if (cmod_acc >= 1000) {
-				while (cmod_acc >= 1000)
-					cmod_acc -= 1000;
+			if (cmod_acc >= 3000) {
+				while (cmod_acc >= 3000)
+					cmod_acc -= 3000;
 				if (!m_chunkmod_manifest.empty()) {
 					ChunkMod* cmod = m_chunkmod_manifest.front();
 					m_chunkmod_manifest.pop_front();
@@ -1387,10 +1440,11 @@ void Engine::Render(float elapsedTime) {
 
 			sendPackTo<Input>(m_conn.m_sock_udp, &input, &m_bufout, &m_conn.m_srvsockaddr);
 
-			lsPck = recvPacks(m_conn.m_sock_udp, &m_buf);
+			recvPacks(m_conn.m_sock_udp, &m_buf, &lsPck);
 			char* prevptr = nullptr;
+			Chat chat;
 			for (auto& pck : lsPck) { // We could make a few threads out of this.
-				Sync sync; Output out; ChunkMod cmod; BulletAdd bull; Chat chat;
+				Sync sync; Output out; ChunkMod cmod; BulletAdd bull; 
 				if (!prevptr)
 					prevptr = m_buf.ptr;
 				uint32_t bsize = m_buf.len - (pck - prevptr);
@@ -1406,7 +1460,9 @@ void Engine::Render(float elapsedTime) {
 						if (m_syncs.count(sync.timestamp)) {
 							Sync comp = m_syncs[sync.timestamp];
 
-							//m_player.InflictDamage(sync.hp - comp.hp);
+							std::cout << sync.hp << std::endl;
+
+							m_player.InflictDamage(sync.hp - comp.hp);
 
 							Vector3f diff = sync.position - comp.position;
 
@@ -1463,7 +1519,7 @@ void Engine::Render(float elapsedTime) {
 								m_bullets[0] = bult;
 								break;
 							}
-						m_audio.Create3DAudioObj(m_powpow, AUDIO_PATH "pow.wav", bull.pos, bull.dir * 10, false, .5f);
+						m_audio.Create3DAudioObj(m_powpow, AUDIO_PATH "pow.wav", bull.pos, bull.dir, false, 1.f);
 					}
 					else SystemNotification("Bullet is kraput.");
 					break;
@@ -1583,9 +1639,11 @@ void Engine::DrawSlider(float centerX, float centerY, float value, float minVal,
 	}
 }
 
-
-
 void Engine::KeyPressEvent(unsigned char key) {
+	if (m_gamestate == LOBBY) {
+		m_inputChar = SimulateKeyboard(key);
+		return;
+	}
 	switch (key) {
 	case 0: // A - Gauche
 		if (!m_keyA) {
@@ -1616,7 +1674,8 @@ void Engine::KeyPressEvent(unsigned char key) {
 		else if (m_gamestate == GameState::PAUSE) {
 			m_gamestate = GameState::PLAY;
 		}
-		//Stop();
+		//m_menuaudio.ToggleMusicState();
+		m_audio.ToggleMusicState();
 		break;
 	case 57: // Space - Sauter
 		if (!m_keySpace) {
@@ -1668,6 +1727,12 @@ void Engine::KeyPressEvent(unsigned char key) {
 }
 
 void Engine::KeyReleaseEvent(unsigned char key) {
+	if (m_gamestate == LOBBY) {
+		if (key == 38) {
+			m_keyShift = false;
+		}
+		return;
+	}
 	switch (key) {
 	case 0: // A - Stop gauche
 		m_keyA = false;
@@ -1700,7 +1765,7 @@ void Engine::KeyReleaseEvent(unsigned char key) {
 		m_keyL = false;
 		break;
 	case 12: // M - Toggle music
-		m_audio.ToggleMusicState();
+		//m_audio.ToggleMusicState();
 		break;
 	case 15:
 		for (int x = 0; x < MAX_BULLETS; ++x)  // Ajouter une balle dans l'array (aussi connu sous le nom de "faire pow pow").
@@ -1739,12 +1804,264 @@ void Engine::KeyReleaseEvent(unsigned char key) {
 	case 28: // 2
 		m_key2 = true;
 		break;
+	case 38: // Shift
+		m_keyShift = false;
+		break;
 	case 57: // Espace - Stop sauter
 		m_keySpace = false;
 		break;
+	case 58: // Enter - comfirm input
+		m_keyEnter = false;
+		break;
+	case 59: // backspace - remove char
+		m_keyBackspace = false;
+		break;
 	}
 }
 
+char Engine::SimulateKeyboard(unsigned char key) {
+	switch (key) {
+	case 0: // A
+		if (!m_keyShift) { m_inputChar = 'a'; }
+		else { m_inputChar = 'A'; }
+		break;
+	case 1: // B
+		if (!m_keyShift) { m_inputChar = 'b'; }
+		else { m_inputChar = 'B'; }
+		break;
+	case 2: // C
+		if (!m_keyShift) { m_inputChar = 'c'; }
+		else { m_inputChar = 'C'; }
+		break;
+	case 3: // D
+		if (!m_keyShift) { m_inputChar = 'd'; }
+		else { m_inputChar = 'D'; }
+		break;
+	case 4: // E
+		if (!m_keyShift) { m_inputChar = 'e'; }
+		else { m_inputChar = 'E'; }
+		break;
+	case 5: // F
+		if (!m_keyShift) { m_inputChar = 'f'; }
+		else { m_inputChar = 'F'; }
+		break;
+	case 6: // G
+		if (!m_keyShift) { m_inputChar = 'g'; }
+		else { m_inputChar = 'G'; }
+		break;
+	case 7: // H
+		if (!m_keyShift) { m_inputChar = 'h'; }
+		else { m_inputChar = 'H'; }
+		break;
+	case 8: // I
+		if (!m_keyShift) { m_inputChar = 'i'; }
+		else { m_inputChar = 'I'; }
+		break;
+	case 9: // J
+		if (!m_keyShift) { m_inputChar = 'j'; }
+		else { m_inputChar = 'J'; }
+		break;
+	case 10: // K
+		if (!m_keyShift) { m_inputChar = 'k'; }
+		else { m_inputChar = 'K'; }
+		break;
+	case 11: // L
+		if (!m_keyShift) { m_inputChar = 'l'; }
+		else { m_inputChar = 'L'; }
+		break;
+	case 12: // M
+		if (!m_keyShift) { m_inputChar = 'm'; }
+		else { m_inputChar = 'M'; }
+		break;
+	case 13: // N
+		if (!m_keyShift) { m_inputChar = 'n'; }
+		else { m_inputChar = 'N'; }
+		break;
+	case 14: // O
+		if (!m_keyShift) { m_inputChar = 'o'; }
+		else { m_inputChar = 'O'; }
+		break;
+	case 15: // P
+		if (!m_keyShift) { m_inputChar = 'p'; }
+		else { m_inputChar = 'P'; }
+		break;
+	case 16: // Q
+		if (!m_keyShift) { m_inputChar = 'q'; }
+		else { m_inputChar = 'Q'; }
+		break;
+	case 17: // R
+		if (!m_keyShift) { m_inputChar = 'r'; }
+		else { m_inputChar = 'R'; }
+		break;
+	case 18: // S
+		if (!m_keyShift) { m_inputChar = 's'; }
+		else { m_inputChar = 'S'; }
+		break;
+	case 19: // T
+		if (!m_keyShift) { m_inputChar = 't'; }
+		else { m_inputChar = 'T'; }
+		break;
+	case 20: // U
+		if (!m_keyShift) { m_inputChar = 'u'; }
+		else { m_inputChar = 'U'; }
+		break;
+	case 21: // V
+		if (!m_keyShift) { m_inputChar = 'v'; }
+		else { m_inputChar = 'V'; }
+		break;
+	case 22: // W
+		if (!m_keyShift) { m_inputChar = 'w'; }
+		else { m_inputChar = 'W'; }
+		break;
+	case 23: // X
+		if (!m_keyShift) { m_inputChar = 'x'; }
+		else { m_inputChar = 'X'; }
+		break;
+	case 24: // Y
+		if (!m_keyShift) { m_inputChar = 'y'; }
+		else { m_inputChar = 'Y'; }
+		break;
+	case 25: // Z
+		if (!m_keyShift) { m_inputChar = 'z'; }
+		else { m_inputChar = 'Z'; }
+		break;
+	case 26: // 0
+		if (!m_keyShift) { m_inputChar = '0'; }
+		else { m_inputChar = ')'; }
+		break;
+	case 27: // 1
+		if (!m_keyShift) { m_inputChar = '1'; }
+		else { m_inputChar = '!'; }
+		break;
+	case 28: // 2
+		if (!m_keyShift) { m_inputChar = '2'; }
+		else { m_inputChar = '\"'; }
+		break;
+	case 29: // 3
+		if (!m_keyShift) { m_inputChar = '3'; }
+		else { m_inputChar = '/'; }
+		break;
+	case 30: // 4
+		if (!m_keyShift) { m_inputChar = '4'; }
+		else { m_inputChar = '$'; }
+		break;
+	case 31: // 5
+		if (!m_keyShift) { m_inputChar = '5'; }
+		else { m_inputChar = '%'; }
+		break;
+	case 32: // 6
+		if (!m_keyShift) { m_inputChar = '6'; }
+		else { m_inputChar = '?'; }
+		break;
+	case 33: // 7
+		if (!m_keyShift) { m_inputChar = '7'; }
+		else { m_inputChar = '&'; }
+		break;
+	case 34: // 8
+		if (!m_keyShift) { m_inputChar = '8'; }
+		else { m_inputChar = '*'; }
+		break;
+	case 35: // 9
+		if (!m_keyShift) { m_inputChar = '9'; }
+		else { m_inputChar = ')'; }
+		break;
+	case 38: // SHIFT
+		m_keyShift = true;
+		break;
+	case 50: // . (Period)
+		m_inputChar = '.';
+		break;
+	case 56: // _ (Underscore)
+		if (!m_keyShift) { m_inputChar = '-'; }
+		else { m_inputChar = '_'; }
+		break;
+	case 57: // SPACE
+		m_inputChar = ' ';
+		break;
+	case 58: // ENTER
+		m_keyEnter = true;
+		break;
+	case 59: // BACKSPACE
+		m_keyBackspace = true;
+		break;
+	default:
+		m_invalidChar = true;
+		break;
+	}
+
+	if ((int)key != 38 && !m_invalidChar) {
+		m_charChanged = true;
+		std::cout << "Key pressed: " << (int)key << " (" << m_inputChar << ")" << std::endl;
+	}
+
+	m_invalidChar = false;
+	return m_inputChar;
+}
+
+void Engine::HandlePlayerInput(float elapsedTime) {
+	static float lobbyTime = 0.0f;
+	lobbyTime += elapsedTime;
+	float onInterval = 0.5f;
+	float offInterval = 1.0f;
+
+	m_textureFont.Bind();
+	std::ostringstream ss;
+
+	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+
+	if (m_charChanged) {
+		if (m_keyBackspace) {
+			if (!m_currentInputString.empty()) {
+				m_currentInputString.pop_back();
+			}
+			m_keyBackspace = false;
+		}
+		else if (m_keyEnter) {
+			if (m_settingUsername) {
+				if (!m_currentInputString.empty() &&
+					m_currentInputString.size() > 1 &&
+					m_currentInputString.size() < 26) {
+					m_username = m_currentInputString;
+					m_currentInputString = "";
+					m_settingUsername = false;
+					m_settingServer = true;
+				}
+			}
+			else if (m_settingServer) {
+				if (!m_currentInputString.empty()) {
+					m_serverAddr = m_currentInputString;
+					m_currentInputString = "";
+					m_settingServer = false;
+					m_multiReady = true;
+				}
+			}
+			m_keyEnter = false;
+		}
+		else if (m_settingUsername && m_currentInputString.size() < 26) {
+			m_currentInputString += m_inputChar;
+		}
+		else if (m_settingServer && m_currentInputString.size() < 15) {
+			m_currentInputString += m_inputChar;
+		}
+	}
+
+	ss << m_currentInputString;
+	m_charChanged = false;
+
+	if (lobbyTime < onInterval) {
+		ss << "_";
+	}
+	else if (lobbyTime > onInterval && lobbyTime < offInterval) {
+		ss << " ";
+	}
+	else {
+		lobbyTime = 0.0f;
+	}
+
+	PrintText(Width() * 0.6f, Height() * 0.4f, ss.str(), 2.0f);
+}
+
+
 void Engine::MouseMoveEvent(int x, int y) {
 	if (m_gamestate == GameState::PLAY) {
 		m_player.TurnLeftRight(x - (Width() / 2));
@@ -1832,7 +2149,8 @@ void Engine::MousePressEvent(const MOUSE_BUTTON& button, int x, int y) {
 		}
 		else if (x > leftButton && x < rightButton && y > bottomSecond && y < topSecond) {
 			if (m_selectedPlayOptions) {
-				m_gamestate = GameState::PLAY;
+				m_gamestate = GameState::LOBBY;
+				m_settingUsername = true;
 			}
 			else {
 				m_gamestate = GameState::OPTIONS;

SQCSim2021/engine.h

@@ -46,6 +46,7 @@ private:
     int GetFps(float elapsedTime) const;
     int GetCountdown(float elapsedTime);
     int GetOptionsChoice();
+    bool StartMultiplayerGame();
 
     bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true);
 
@@ -62,13 +63,16 @@ private:
     void DisplayInfo(float elapsedTime, BlockType bloc);
 
     void DisplaySplashScreen();
-    void DisplayPauseMenu();
 
     void DisplayMainMenu();
     void DrawButtonBackgrounds(float centerX, float centerY, int iterations);
     void DrawMainMenuButtons(float centerX, float centerY);
     void DrawSingleMultiButtons(float centerX, float centerY);
 
+    void DisplayLobbyMenu(float elapsedTime);
+    void SetPlayerUsername(float elapsedTime);
+    void SetServerAddress(float elapsedTime);
+
     void DisplayOptionsMenu();
     void DisplayAudioMenu(float centerX, float centerY);
     void DisplayGraphicsMenu(float centerX, float centerY);
@@ -77,11 +81,13 @@ private:
     void DisplayBarPercentValue(float centerX, float centerY, float posX, float posY, float minVal, float maxVal, float value);
     void DrawSlider(float centerX, float centerY, float value, float minVal, float maxVal, float bottomSideValue, float topSideValue);
 
-
     void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
     void ProcessNotificationQueue();
+    char SimulateKeyboard(unsigned char key);
+    void HandlePlayerInput(float elapsedTime);
 
-    Audio m_audio = Audio(AUDIO_PATH "start.wav");
+    //udio m_menuaudio = Audio(AUDIO_PATH "menumusic.wav");
+    Audio m_audio = Audio(AUDIO_PATH "music01.wav");
     irrklang::ISound* m_powpow, * m_scream;
     irrklang::ISound* m_whoosh[MAX_BULLETS];
 
@@ -99,7 +105,7 @@ private:
     BlockInfo* m_blockinfo[BTYPE_LAST];
     BoostInfo* m_boostinfo[BTYPE_BOOST_LAST];
 
-    GameState m_gamestate = GameState::PLAY;
+    GameState m_gamestate = GameState::SPLASH;
 
     Shader m_shader01;
 
@@ -116,6 +122,7 @@ private:
     Texture m_texturePovGun;
     Texture m_textureSkybox;
 
+    Texture m_textureLobbyMenu;
     Texture m_textureMainMenu;
     Texture m_textureOptionsMenu;
     Texture m_texturePauseMenu;
@@ -125,6 +132,9 @@ private:
     Texture m_textureFhd;
     Texture m_textureQhd;
     Texture m_textureUhd;
+
+    Texture m_textureLobbyServer;
+    Texture m_textureLobbyIdentify;
     Texture m_textureCheck;
     Texture m_textureChecked;
 
@@ -190,6 +200,16 @@ private:
     bool m_selectedPlayOptions = false;
     bool m_selectedOptions = false;
     bool m_selectedQuit = false;
+
+    std::string m_currentInputString;
+    std::string m_username;
+    std::string m_serverAddr;
+    char m_inputChar = 0;
+    bool m_invalidChar = false;
+    bool m_charChanged = false;
+    bool m_settingUsername = false;
+    bool m_settingServer = false;
+    bool m_multiReady = false;
     
     bool m_key1 = false;
     bool m_key2 = false;
@@ -199,7 +219,10 @@ private:
     bool m_keyA = false;
     bool m_keyS = false;
     bool m_keyD = false;
+    bool m_keyEnter = false;
     bool m_keySpace = false;
+    bool m_keyShift = false;
+    bool m_keyBackspace = false;
 
     bool m_mouseL = false;
     bool m_mouseR = false;
@@ -218,9 +241,8 @@ private:
     std::unordered_map<uint64_t, Player*> m_players;
     netprot::Buffer m_buf, m_bufout;
     netprot::ChunkMod* m_chunkmod = nullptr;
-    netprot::PlayerInfo m_pinfo;
+
     std::unordered_map<uint64_t, netprot::Sync> m_syncs;
-    RemotePlayer m_remotePlayer = RemotePlayer(netprot::PlayerInfo(),Vector3f(5.5f, CHUNK_SIZE_Y + 1.8f, 5.5f));
     std::string m_messageNotification = "";
 };
 

SQCSim2021/remoteplayer.cpp

@@ -32,8 +32,6 @@ void RemotePlayer::Feed(const netprot::Output out) {
 	m_position = Vector3f(out.position);
 	m_direction = Vector3f(out.direction);
 
-	std::cout << "Dead: " << out.states.dead << " Hit:" << out.states.hit << " Jump:" << out.states.jumping << " JumpShot: " << out.states.jumpshot << " Running: " << out.states.running << " Shooting: " << out.states.shooting << " Still: " << out.states.still << std::endl;
-	//std::cout << "powerUp " << out.states.powerup << std::endl;
 	current.states = out.states;
 
 	//current.position = out.position;