cosmetic (dvlnet)

pionere · Nov 18, 2023 · 4c1b708 · 4c1b708
1 parent 3ba1a25
commit 4c1b708
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/Source/automap.cpp b/Source/automap.cpp
@@ -207,7 +207,7 @@ static void DrawAutomapDoorDiamond(int dir, int sx, int sy)
 {
 	// int y2;
 	unsigned d32 = AmLine32;
-	unsigned d16 = (d32 >> 1), d8 = (d32 >> 2), d4 = (d32 >> 3), d2 = (d32 >> 4);
+	unsigned d16 = (d32 >> 1), d8 = (d32 >> 2), d4 = (d32 >> 3);
 
 	if (dir == 0) { // WEST
 		sx -= d8;

diff --git a/Source/dvlnet/base_protocol.h b/Source/dvlnet/base_protocol.h
@@ -22,10 +22,10 @@ class base_protocol : public base_client {
 	virtual ~base_protocol() = default;
 
 protected:
-	virtual void poll();
-	virtual void send_packet(packet& pkt);
-	virtual void disconnect_net(plr_t pnum);
-	virtual void close();
+	void poll() override;
+	void send_packet(packet& pkt) override;
+	void disconnect_net(plr_t pnum) override;
+	void close() override;
 
 private:
 	P proto;
@@ -50,7 +50,7 @@ class base_protocol : public base_client {
 template <class P>
 plr_t base_protocol<P>::get_master()
 {
-	for (plr_t i = 0; i < MAX_PLRS; ++i)
+	for (plr_t i = 0; i < MAX_PLRS; i++)
 		if (peers[i])
 			return i;
 	return plr_self;
@@ -90,7 +90,7 @@ template <class P>
 bool base_protocol<P>::wait_firstpeer()
 {
 	// wait for peer for 5 seconds
-	for (auto i = 0; i < 500; ++i) {
+	for (auto i = 0; i < 500; i++) {
 		if (game_list.count(gamename)) {
 			firstpeer = game_list[gamename];
 			break;
@@ -129,14 +129,16 @@ void base_protocol<P>::wait_join()
 template <class P>
 bool base_protocol<P>::setup_game(_uigamedata* gameData, const char* addrstr, unsigned port, const char* passwd, char (&errorText)[256])
 {
-	bool createGame = gameData != NULL;
+	bool createGame;
+
+	setup_password(passwd);
 
+	createGame = gameData != NULL;
 	if (createGame) {
 		setup_gameinfo(gameData);
 	}
 	//addrstr = "fd80:56c2:e21c:0:199:931d:b14:c4d2";
 	plr_self = PLR_BROADCAST;
-	setup_password(passwd);
 	gamename = std::string(addrstr);
 	if (wait_network()) {
 		if (createGame) {
@@ -191,7 +193,7 @@ void base_protocol<P>::poll()
 			delete pkt;
 		}
 		while (proto.get_disconnected(sender)) {
-			for (plr_t i = 0; i < MAX_PLRS; ++i) {
+			for (plr_t i = 0; i < MAX_PLRS; i++) {
 				if (peers[i] == sender) {
 					disconnect_net(i);
 					break;
@@ -208,7 +210,7 @@ template <class P>
 void base_protocol<P>::handle_join_request(packet& pkt, endpoint sender)
 {
 	plr_t i;
-	for (i = 0; i < MAX_PLRS; ++i) {
+	for (i = 0; i < MAX_PLRS; i++) {
 		if (i != plr_self && !peers[i]) {
 			peers[i] = sender;
 			break;
@@ -218,7 +220,7 @@ void base_protocol<P>::handle_join_request(packet& pkt, endpoint sender)
 		//already full
 		return;
 	}
-	for (plr_t j = 0; j < MAX_PLRS; ++j) {
+	for (plr_t j = 0; j < MAX_PLRS; j++) {
 		if ((j != plr_self) && (j != i) && peers[j]) {
 			packet* infopkt = pktfty.make_out_packet<PT_CONNECT>(PLR_MASTER, PLR_BROADCAST, j, buffer_t(peers[j].addr.begin(), peers[j].addr.end()));
 			proto.send(sender, infopkt->encrypted_data());

diff --git a/Source/dvlnet/tcp_client.cpp b/Source/dvlnet/tcp_client.cpp
@@ -48,8 +48,7 @@ bool tcp_client::setup_game(_uigamedata* gameData, const char* addrstr, unsigned
 			return true; // join successful
 		SDL_Delay(MS_SLEEP);
 	}
-	if (i == NUM_SLEEP)
-		copy_cstr(errorText, "Unable to connect");
+	copy_cstr(errorText, "Unable to connect");
 	close();
 	return false;
 }

diff --git a/Source/dvlnet/tcpd_client.cpp b/Source/dvlnet/tcpd_client.cpp
@@ -57,8 +57,7 @@ bool tcpd_client::setup_game(_uigamedata* gameData, const char* addrstr, unsigne
 			return true; // join successful
 		SDL_Delay(MS_SLEEP);
 	}
-	if (i == NUM_SLEEP)
-		copy_cstr(errorText, "Unable to connect");
+	copy_cstr(errorText, "Unable to connect");
 	close();
 	return false;
 }
@@ -377,7 +376,7 @@ void tcpd_client::close()
 
 	// close the server
 	if (local_server != NULL) {
-		local_server->close();
+		// local_server->close();
 		delete local_server;
 		local_server = NULL;
 	}

diff --git a/Source/dvlnet/tcpd_client.h b/Source/dvlnet/tcpd_client.h
@@ -22,7 +22,8 @@ class tcpd_client : public base_client {
 protected:
 	void poll() override;
 	void send_packet(packet& pkt) override;
-	void recv_connect(packet& pkt);
+	void recv_connect(packet& pkt) override;
+	void disconnect_net(plr_t pnum) override;
 	void close() override;
 
 private:
@@ -51,7 +52,6 @@ class tcpd_client : public base_client {
 	bool handle_recv_newplr(const tcp_server::scc& con, packet& pkt);
 	bool handle_recv_packet(const tcp_server::scc& con, packet& pkt);
 	void drop_connection(const tcp_server::scc& con);
-	void disconnect_net(plr_t pnum);
 
 	void handle_recv(const asio::error_code& ec, size_t bytesRead);
 	void start_recv();