From 6cce49402997311d2517aa9ef4950aea9307c534 Mon Sep 17 00:00:00 2001
From: louist103 <louist103@gmail.com>
Date: Fri, 6 May 2022 18:05:27 -0400
Subject: [PATCH] Fix logging

---
 soh/soh/Enhancements/debugconsole.cpp | 12 +++++++++++-
 soh/soh/Enhancements/savestates.cpp   |  2 ++
 soh/soh/Enhancements/savestates.h     |  5 +----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index 1942f998e..bd54f970d 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -1,3 +1,7 @@
+#ifdef _MSC_VER
+#define NOGDI
+#endif
+
 #include "debugconsole.h"
 #include "../libultraship/SohImGuiImpl.h"
 #include "savestates.h"
@@ -318,6 +322,10 @@ static bool SaveStateHandler(const std::vector<std::string>& args) {
         case SaveStateReturn::FAIL_INVALID_SLOT:
             ERROR("[SOH] Invalid State Slot Number (%u)", slot);
             return CMD_FAILED;
+        case SaveStateReturn::FAIL_WRONG_GAMESTATE:
+            ERROR("[SOH] Can not save a state outside of \"GamePlay\"");
+            return CMD_FAILED;
+
     }
 }
 
@@ -335,7 +343,9 @@ static bool LoadStateHandler(const std::vector<std::string>& args) {
         case SaveStateReturn::FAIL_STATE_EMPTY:
             ERROR("[SOH] State Slot (%u) is empty", slot);
             return CMD_FAILED;
-            
+        case SaveStateReturn::FAIL_WRONG_GAMESTATE:
+            ERROR("[SOH] Can not load a state outside of \"GamePlay\"");
+            return CMD_FAILED;            
     }
 
 }
diff --git a/soh/soh/Enhancements/savestates.cpp b/soh/soh/Enhancements/savestates.cpp
index 0538ebbcb..1ad2589bd 100644
--- a/soh/soh/Enhancements/savestates.cpp
+++ b/soh/soh/Enhancements/savestates.cpp
@@ -679,6 +679,7 @@ void SaveStateMgr::ProcessSaveStateRequests(void) {
 
 SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) {
     if (gGlobalCtx == nullptr) {
+        SPDLOG_ERROR("[SOH] Can not save or load a state outside of \"GamePlay\"");
         return SaveStateReturn::FAIL_WRONG_GAMESTATE;
     }
 
@@ -696,6 +697,7 @@ SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) {
             break;
         [[unlikely]] default: 
             SPDLOG_ERROR("Invalid SaveState request type: {}", request.type);
+            return SaveStateReturn::FAIL_BAD_REQUEST;
             break;
         
     }
diff --git a/soh/soh/Enhancements/savestates.h b/soh/soh/Enhancements/savestates.h
index 158143605..2cedbcc1d 100644
--- a/soh/soh/Enhancements/savestates.h
+++ b/soh/soh/Enhancements/savestates.h
@@ -12,11 +12,8 @@ enum class SaveStateReturn {
     FAIL_INVALID_SLOT,
     FAIL_NO_MEMORY,
     FAIL_STATE_EMPTY,
-    FAIL_FILE_NOT_FOUND,
-    FAIL_FILE_NOT_OPENED,
-    FAIL_INVALID_MAGIC,
-    FAIL_INVALID_SIZE,
     FAIL_WRONG_GAMESTATE,
+    FAIL_BAD_REQUEST,
 };
 
 typedef struct SaveStateHeader {