mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-03-03 02:01:47 -05:00
Code Issues Projects Releases Wiki Activity

Initial pass on some logging that would be helpful for debugging crashes/problems (#1457)

Browse Source
This commit is contained in:
Garrett Cox 2023-09-14 21:31:05 -05:00 committed by GitHub
parent 0a1e70ebaa
commit 7dffd63c39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/SaveManager.cpp
View File

@ -708,6 +708,7 @@ void SaveManager::InitFileDebug() {
// Threaded SaveFile takes copy of gSaveContext for local unmodified storage
void SaveManager::SaveFileThreaded(int fileNum, SaveContext* saveContext, int sectionID) {
SPDLOG_INFO("Save File - fileNum: {}", fileNum);
// Needed for first time save, hasn't changed in forever anyway
saveBlock["version"] = 1;
if (sectionID == SECTION_ID_BASE) {
@ -800,6 +801,7 @@ void SaveManager::SaveGlobal() {
}
void SaveManager::LoadFile(int fileNum) {
SPDLOG_INFO("Load File - fileNum: {}", fileNum);
assert(std::filesystem::exists(GetFileName(fileNum)));
InitFile(false);

1
soh/soh/z_play_otr.cpp
View File

@ -87,6 +87,7 @@ void OTRPlay_InitScene(PlayState* play, s32 spawn) {
auto data2 = ResourceMgr_LoadVtxByCRC(0x68d4ea06044e228f);*/
GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSceneInit>(play->sceneNum);
SPDLOG_INFO("Scene Init - sceneNum: {0:#x}, entranceIndex: {1:#x}", play->sceneNum, gSaveContext.entranceIndex);
volatile int a = 0;
}

2
soh/soh/z_scene_otr.cpp
View File

@ -541,6 +541,8 @@ extern "C" s32 OTRfunc_8009728C(PlayState* play, RoomContext* roomCtx, s32 roomN
roomCtx->unk_30 ^= 1;
SPDLOG_INFO("Room Init - curRoom.num: {0:#x}", roomCtx->curRoom.num);
return 1;
}

4
soh/src/code/z_actor.c
View File

@ -662,6 +662,7 @@ s32 Flags_GetSwitch(PlayState* play, s32 flag) {
* Sets current scene switch flag.
*/
void Flags_SetSwitch(PlayState* play, s32 flag) {
lusprintf(__FILE__, __LINE__, 2, "Switch Flag Set - %#x", flag);
if (flag < 0x20) {
play->actorCtx.flags.swch |= (1 << flag);
} else {
@ -673,6 +674,7 @@ void Flags_SetSwitch(PlayState* play, s32 flag) {
* Unsets current scene switch flag.
*/
void Flags_UnsetSwitch(PlayState* play, s32 flag) {
lusprintf(__FILE__, __LINE__, 2, "Switch Flag Unset - %#x", flag);
if (flag < 0x20) {
play->actorCtx.flags.swch &= ~(1 << flag);
} else {
@ -724,6 +726,7 @@ s32 Flags_GetTreasure(PlayState* play, s32 flag) {
* Sets current scene chest flag.
*/
void Flags_SetTreasure(PlayState* play, s32 flag) {
lusprintf(__FILE__, __LINE__, 2, "Treasure Flag Set - %#x", flag);
play->actorCtx.flags.chest |= (1 << flag);
}
@ -784,6 +787,7 @@ s32 Flags_GetCollectible(PlayState* play, s32 flag) {
* Sets current scene collectible flag.
*/
void Flags_SetCollectible(PlayState* play, s32 flag) {
lusprintf(__FILE__, __LINE__, 2, "Collectible Flag Set - %#x", flag);
if (flag != 0) {
if (flag < 0x20) {
play->actorCtx.flags.collect |= (1 << flag);

1
soh/src/code/z_message_PAL.c
View File

@ -1576,6 +1576,7 @@ void Message_Decode(PlayState* play) {
extern const char* msgStaticTbl[];
void Message_OpenText(PlayState* play, u16 textId) {
lusprintf(__FILE__, __LINE__, 2, "Display Text - textId: %#x", textId);
static s16 messageStaticIndices[] = { 0, 1, 3, 2 };
MessageContext* msgCtx = &play->msgCtx;
Font* font = &msgCtx->font;

1
soh/src/code/z_parameter.c
View File

@ -1759,6 +1759,7 @@ u8 Return_Item(u8 itemID, ModIndex modId, ItemID returnItem) {
* @return u8
*/
u8 Item_Give(PlayState* play, u8 item) {
lusprintf(__FILE__, __LINE__, 2, "Item Give - item: %#x", item);
static s16 sAmmoRefillCounts[] = { 5, 10, 20, 30, 5, 10, 30, 0, 5, 20, 1, 5, 20, 50, 200, 10 };
s16 i;
s16 slot;