Fix MSVC compiler warnings (#10197)

minetest · Aug 23, 2020 · 3c2890692bb4c292023a8260cf9ce70f82b2e780 · 3c28906
1 parent 4794879
commit 3c2890692bb4c292023a8260cf9ce70f82b2e780
Unified Split

Showing with 3 additions and 3 deletions.

+1 −1 src/client/fontengine.h

+2 −2 src/gui/guiChatConsole.cpp
diff --git a/src/client/fontengine.h b/src/client/fontengine.h
@@ -48,7 +48,7 @@ struct FontSpec {
 
 	u16 getHash()
 	{
-		return (mode << 2) | (bold << 1) | italic;
+		return (mode << 2) | (static_cast<u8>(bold) << 1) | static_cast<u8>(italic);
 	}
 
 	unsigned int size;

diff --git a/src/gui/guiChatConsole.cpp b/src/gui/guiChatConsole.cpp
@@ -545,7 +545,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event)
 			if (prompt.getCursorLength() <= 0)
 				return true;
 			std::wstring wselected = prompt.getSelection();
-			std::string selected(wselected.begin(), wselected.end());
+			std::string selected = wide_to_utf8(wselected);
 			Environment->getOSOperator()->copyToClipboard(selected.c_str());
 			return true;
 		}
@@ -575,7 +575,7 @@ bool GUIChatConsole::OnEvent(const SEvent& event)
 			if (prompt.getCursorLength() <= 0)
 				return true;
 			std::wstring wselected = prompt.getSelection();
-			std::string selected(wselected.begin(), wselected.end());
+			std::string selected = wide_to_utf8(wselected);
 			Environment->getOSOperator()->copyToClipboard(selected.c_str());
 			prompt.cursorOperation(
 				ChatPrompt::CURSOROP_DELETE,