From 4f6c5791a7562cfbc78b784a246d53bd931c9c87 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Wed, 25 Sep 2019 20:24:19 +0100
Subject: [PATCH] Fix some compiler warnings

---
 SourceX/DiabloUI/diabloui.cpp  | 2 +-
 SourceX/dvlnet/frame_queue.cpp | 2 +-
 SourceX/dvlnet/udp_p2p.h       | 2 --
 SourceX/miniwin/misc_msg.cpp   | 2 +-
 SourceX/storm/storm.cpp        | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/SourceX/DiabloUI/diabloui.cpp b/SourceX/DiabloUI/diabloui.cpp
index 06140a845..c3e5fcdca 100644
--- a/SourceX/DiabloUI/diabloui.cpp
+++ b/SourceX/DiabloUI/diabloui.cpp
@@ -598,7 +598,7 @@ void DrawArt(int screenX, int screenY, Art *art, int nFrame, DWORD drawW)
 		return;
 
 	SDL_Rect src_rect = { 0, nFrame * art->h(), art->w(), art->h() };
-	if (drawW && drawW < src_rect.w)
+	if (drawW && static_cast<int>(drawW) < src_rect.w)
 		src_rect.w = drawW;
 	SDL_Rect dst_rect = { screenX + SCREEN_X, screenY + SCREEN_Y, src_rect.w, src_rect.h };
 
diff --git a/SourceX/dvlnet/frame_queue.cpp b/SourceX/dvlnet/frame_queue.cpp
index f1be990c9..d273efc82 100644
--- a/SourceX/dvlnet/frame_queue.cpp
+++ b/SourceX/dvlnet/frame_queue.cpp
@@ -62,7 +62,7 @@ buffer_t frame_queue::read_packet()
 {
 	if (!nextsize || (size() < nextsize))
 		throw frame_queue_exception();
-	auto ret = std::move(read(nextsize));
+	auto ret = read(nextsize);
 	nextsize = 0;
 	return ret;
 }
diff --git a/SourceX/dvlnet/udp_p2p.h b/SourceX/dvlnet/udp_p2p.h
index 94cb2e9f4..db2f89990 100644
--- a/SourceX/dvlnet/udp_p2p.h
+++ b/SourceX/dvlnet/udp_p2p.h
@@ -24,8 +24,6 @@ private:
 	typedef asio::ip::udp::endpoint endpoint;
 	static const endpoint none;
 
-	unsigned short udpport_self = 0;
-
 	static constexpr unsigned short default_port = 6112;
 	static constexpr unsigned short try_ports = 512;
 	static constexpr int ACTIVE = 60;
diff --git a/SourceX/miniwin/misc_msg.cpp b/SourceX/miniwin/misc_msg.cpp
index a194b93d4..1826d5387 100644
--- a/SourceX/miniwin/misc_msg.cpp
+++ b/SourceX/miniwin/misc_msg.cpp
@@ -187,7 +187,7 @@ static WPARAM keystate_for_mouse(WPARAM ret)
 
 static WINBOOL false_avail()
 {
-	DUMMY_PRINT("return false although event available", 1);
+	DUMMY_PRINT("return %s although event available", "false");
 	return false;
 }
 
diff --git a/SourceX/storm/storm.cpp b/SourceX/storm/storm.cpp
index b992a66d3..0ba75364f 100644
--- a/SourceX/storm/storm.cpp
+++ b/SourceX/storm/storm.cpp
@@ -156,7 +156,7 @@ BOOL SFileOpenFile(const char *filename, HANDLE *phFile)
 	if (directFileAccess) {
 		char directPath[DVL_MAX_PATH] = "\0";
 		for (size_t i = 0; i < strlen(filename); i++) {
-			directPath[i] = AsciiToLowerTable_Path[filename[i]];
+			directPath[i] = AsciiToLowerTable_Path[static_cast<unsigned char>(filename[i])];
 		}
 		result = SFileOpenFileEx((HANDLE)0, directPath, 0xFFFFFFFF, phFile);
 	}