github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 14:23:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix logging

Browse source
This commit is contained in:
louist103 2022-05-06 18:05:27 -04:00
commit cb56cac3a2
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
soh/soh/Enhancements/debugconsole.cpp
View file

@ -1,3 +1,7 @@
#ifdef _MSC_VER
#define NOGDI
#endif
#include "debugconsole.h" #include "debugconsole.h"
#include "../libultraship/SohImGuiImpl.h" #include "../libultraship/SohImGuiImpl.h"
#include "savestates.h" #include "savestates.h"
@ -318,6 +322,10 @@ static bool SaveStateHandler(const std::vector<std::string>& args) {
case SaveStateReturn::FAIL_INVALID_SLOT: case SaveStateReturn::FAIL_INVALID_SLOT:
ERROR("[SOH] Invalid State Slot Number (%u)", slot); ERROR("[SOH] Invalid State Slot Number (%u)", slot);
return CMD_FAILED; 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: case SaveStateReturn::FAIL_STATE_EMPTY:
ERROR("[SOH] State Slot (%u) is empty", slot); ERROR("[SOH] State Slot (%u) is empty", slot);
return CMD_FAILED; return CMD_FAILED;
case SaveStateReturn::FAIL_WRONG_GAMESTATE:
ERROR("[SOH] Can not load a state outside of \"GamePlay\"");
return CMD_FAILED;
} }
} }

2
soh/soh/Enhancements/savestates.cpp
View file

@ -679,6 +679,7 @@ void SaveStateMgr::ProcessSaveStateRequests(void) {
SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) { SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) {
if (gGlobalCtx == nullptr) { if (gGlobalCtx == nullptr) {
SPDLOG_ERROR("[SOH] Can not save or load a state outside of \"GamePlay\"");
return SaveStateReturn::FAIL_WRONG_GAMESTATE; return SaveStateReturn::FAIL_WRONG_GAMESTATE;
} }
@ -696,6 +697,7 @@ SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) {
break; break;
[[unlikely]] default: [[unlikely]] default:
SPDLOG_ERROR("Invalid SaveState request type: {}", request.type); SPDLOG_ERROR("Invalid SaveState request type: {}", request.type);
return SaveStateReturn::FAIL_BAD_REQUEST;
break; break;
} }

5
soh/soh/Enhancements/savestates.h
View file

@ -12,11 +12,8 @@ enum class SaveStateReturn {
FAIL_INVALID_SLOT, FAIL_INVALID_SLOT,
FAIL_NO_MEMORY, FAIL_NO_MEMORY,
FAIL_STATE_EMPTY, FAIL_STATE_EMPTY,
FAIL_FILE_NOT_FOUND,
FAIL_FILE_NOT_OPENED,
FAIL_INVALID_MAGIC,
FAIL_INVALID_SIZE,
FAIL_WRONG_GAMESTATE, FAIL_WRONG_GAMESTATE,
FAIL_BAD_REQUEST,
}; };
typedef struct SaveStateHeader { typedef struct SaveStateHeader {