From 5c02e6649c523dbd6557cb4d629fdd994c2eaef5 Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Sat, 2 Oct 2021 16:53:47 +0200
Subject: Fixed conversion and narrowing errors in Joystick error handler

---
 Stars45/Joystick.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Stars45')

diff --git a/Stars45/Joystick.cpp b/Stars45/Joystick.cpp
index 3d641dd..5a30f8d 100644
--- a/Stars45/Joystick.cpp
+++ b/Stars45/Joystick.cpp
@@ -65,7 +65,7 @@ static int                    strikes = 3;
 static Joystick*              joystick = 0;
 
 void   DirectInputError(const char* msg, HRESULT err);
-char*  DIErrStr(HRESULT hr);
+const char*  DIErrStr(HRESULT hr);
 void   ReleaseDirectInput();
 
 // +--------------------------------------------------------------------+
@@ -857,11 +857,12 @@ DirectInputError(const char* msg, HRESULT err)
 
 static char errstrbuf[128];
 
-char* DIErrStr(HRESULT hr)
+const char* DIErrStr(HRESULT hr)
 {
-    switch (hr) {
+    auto casted = static_cast<long unsigned int>(hr);
+    switch (casted) {
     default:
-        sprintf_s(errstrbuf, "Unrecognized error value = %08x.", hr);
+        sprintf_s(errstrbuf, "Unrecognized error value = %08x.", casted);
         return errstrbuf;
 
     case DI_OK:
-- 
cgit v1.1