Fix warnings, explicitly set MSVC version to 17

Author: dbierek

.github/workflows/build.yml

@@ -29,6 +29,7 @@ jobs:
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: x64
+        ver: 17
 
     - name: Build and install debug
       run: |

include/NavKit/NavKit.h

@@ -33,7 +33,7 @@ add_executable (NavKit
   module/SceneExtract.cpp
   module/Settings.cpp
   util/FileUtil.cpp
-        util/ErrorHandler.cpp
+  util/ErrorHandler.cpp
 )
 target_include_directories(NavKit PUBLIC "${PROJECT_BINARY_DIR}")
 target_include_directories(NavKit PRIVATE ${SIMPLEINI_INCLUDE_DIRS})
@@ -73,7 +73,6 @@ add_custom_command(
   COMMENT "Copying ${NAV_WEAKNESS_DLL} to ${CMAKE_BINARY_DIR}"
 )
 
-
 file(COPY "${NavKit_SOURCE_DIR}/lib/Debug/ResourceLib_HM3.dll" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
 file(COPY "${NavKit_SOURCE_DIR}/bin/Glacier2Obj.exe" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
 file(COPY "${NavKit_SOURCE_DIR}/src/resource/Glacier2Obj.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
@@ -113,6 +112,4 @@ target_link_libraries(NavKit
 )
 set_target_properties(NavKit PROPERTIES WIN32_EXECUTABLE TRUE)
 
-if (CMAKE_VERSION VERSION_GREATER 3.12)
-  set_property(TARGET NavKit PROPERTY CXX_STANDARD 20)
-endif()
+set_property(TARGET NavKit PROPERTY CXX_STANDARD 20)

src/CMakeLists.txt

@@ -19,7 +19,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
 */
-#include "../include/NavKit/NavKit.h"
 #include <SDL.h>
 #include <cpptrace/from_current.hpp>
 #include "../include/NavKit/module/Airg.h"
@@ -36,10 +35,6 @@
 #undef main
 
 int SDL_main(const int argc, char **argv) {
-    return NavKit::runProgram();
-}
-
-int NavKit::runProgram() {
     CPPTRACE_TRY
         {
             std::thread logThread(Logger::logRunner);
@@ -86,17 +81,14 @@ int NavKit::runProgram() {
 
             NFD_Quit();
             renderer.closeWindow();
+            return 0;
         }
     CPPTRACE_CATCH(const std::exception& e) {
         ErrorHandler::openErrorDialog("An unexpected error occurred: " + std::string(e.what()) + "\n\nStack Trace:\n" +
                                       cpptrace::from_current_exception().to_string());
-
-        return 1;
     } catch (...) {
-        ErrorHandler::openErrorDialog("An unexpected error occurred:\n\nStack Trace:\n" +
+        ErrorHandler::openErrorDialog("An unexpected error occurred:\n\nStack Trace: \n" +
                                       cpptrace::from_current_exception().to_string());
-        return 1;
     }
-
     return 0;
 }

src/NavKit.cpp

@@ -1,12 +1,12 @@
 #include "../../include/NavKit/model/ReasoningGrid.h"
-#include "../../include/NavKit/module/Logger.h"
+#include <algorithm>
+#include <from_current.hpp>
+#include <set>
 #include "../../include/NavKit/module/Airg.h"
+#include "../../include/NavKit/module/Logger.h"
 #include "../../include/NavKit/module/Navp.h"
 #include "../../include/NavKit/module/Renderer.h"
 #include "../../include/NavKit/util/ErrorHandler.h"
-#include <algorithm>
-#include <from_current.hpp>
-#include <set>
 
 const void Vec4::writeJson(std::ostream &f) {
     f << "{";

src/model/ReasoningGrid.cpp

@@ -1,13 +1,13 @@
+#include "../../include/NavKit/module/InputHandler.h"
 #include "../../include/NavKit/module/Airg.h"
 #include "../../include/NavKit/module/Gui.h"
-#include "../../include/NavKit/module/InputHandler.h"
 #include "../../include/NavKit/module/Navp.h"
 #include "../../include/NavKit/module/Renderer.h"
 #include "../../include/RecastDemo/imgui.h"
 
 #include <algorithm>
-#include <SDL_opengl.h>
 #include <SDL.h>
+#include <SDL_opengl.h>
 
 const int InputHandler::QUIT = 1;
 
@@ -32,6 +32,7 @@ int InputHandler::handleInput() {
     Renderer& renderer = Renderer::getInstance();
     Airg& airg = Airg::getInstance();
     Navp& navp = Navp::getInstance();
+    bool done = false;
     while (SDL_PollEvent(&event)) {
         switch (event.type) {
             case SDL_WINDOWEVENT:
@@ -109,8 +110,8 @@ int InputHandler::handleInput() {
                 break;
 
             case SDL_QUIT:
-                return QUIT;
-
+                done = true;
+                break;
             default:
                 break;
         }
@@ -128,6 +129,9 @@ int InputHandler::handleInput() {
     if (SDL_GetModState() & KMOD_CTRL) {
         keybSpeed /= 4.0f;
     }
+    if (done) {
+        return QUIT;
+    }
     return 0;
 }
 

src/module/InputHandler.cpp

@@ -1,6 +1,6 @@
 #include "../../include/NavKit/util/ErrorHandler.h"
-#include "../../include/NavKit/module/Renderer.h"
 #include "../../include/NavKit/Resource.h"
+#include "../../include/NavKit/module/Renderer.h"
 
 std::string *ErrorHandler::errorMessage = nullptr;
 
@@ -18,27 +18,26 @@ INT_PTR CALLBACK ErrorHandler::ErrorDialogHandler(HWND hwndDlg, UINT uMsg, WPARA
                 EndDialog(hwndDlg, IDOK);
                 return TRUE;
             }
-        if (LOWORD(wParam) == IDC_COPY_BUTTON) {
-            OpenClipboard(hwndDlg);
-            EmptyClipboard();
-            if (errorMessage) {
-                HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, errorMessage->length() + 1);
-                char *data = (char *) GlobalLock(hMem);
-                strcpy_s(data, errorMessage->length() + 1, errorMessage->c_str());
-                GlobalUnlock(hMem);
-                SetClipboardData(CF_TEXT, hMem);
-                CloseClipboard();
-                GlobalFree(hMem);
+            if (LOWORD(wParam) == IDC_COPY_BUTTON) {
+                OpenClipboard(hwndDlg);
+                EmptyClipboard();
+                if (errorMessage) {
+                    HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, errorMessage->length() + 1);
+                    char *data = (char *) GlobalLock(hMem);
+                    strcpy_s(data, errorMessage->length() + 1, errorMessage->c_str());
+                    GlobalUnlock(hMem);
+                    SetClipboardData(CF_TEXT, hMem);
+                    CloseClipboard();
+                    GlobalFree(hMem);
+                }
+                return TRUE;
             }
-            return TRUE;
-        }
-        break;
+            return FALSE;
         default: return FALSE;
     }
-    return FALSE;
 }
 
-void ErrorHandler::openErrorDialog(const std::string& message) {
+void ErrorHandler::openErrorDialog(const std::string &message) {
     errorMessage = new std::string(message);
     DialogBoxParamA(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_ERROR_DIALOG), Renderer::hwnd, ErrorDialogHandler, 0);
 }