From 89e0b0d329eb113a61f8e034257049727d6c1ec7 Mon Sep 17 00:00:00 2001 From: PhlexPlexico Date: Sat, 13 Jul 2024 18:07:03 +0000 Subject: [PATCH] Clang-format changes exist. Committing. --- code/include/rnd/item_override.h | 1 - code/source/rnd/item_override.cpp | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/code/include/rnd/item_override.h b/code/include/rnd/item_override.h index 1afc503..3e7e85c 100644 --- a/code/include/rnd/item_override.h +++ b/code/include/rnd/item_override.h @@ -455,7 +455,6 @@ namespace rnd { u32 ItemOverride_GetOshExtData(); u8 ItemOverride_OverrideSkullToken(game::GlobalContext*, game::act::Actor*); u8 ItemOverride_CheckBossStatus(); - } extern "C" u32 rActiveItemGraphicId; extern "C" ItemOverride rItemOverrides[640]; diff --git a/code/source/rnd/item_override.cpp b/code/source/rnd/item_override.cpp index 679307f..44b7509 100644 --- a/code/source/rnd/item_override.cpp +++ b/code/source/rnd/item_override.cpp @@ -1057,17 +1057,17 @@ namespace rnd { u8 ItemOverride_CheckBossStatus() { game::SceneId scene = GetContext().gctx->scene; - switch(scene) { - case game::SceneId::OdolwaLair: - return gExtSaveData.givenItemChecks.odolwaDefeated == 0 ? 1 : 0; - case game::SceneId::GohtLair: - return gExtSaveData.givenItemChecks.gohtDefeated == 0 ? 1 : 0; - case game::SceneId::GyorgLair: - return gExtSaveData.givenItemChecks.gyorgDefeated == 0 ? 1 : 0; - case game::SceneId::TwinmoldLair: - return gExtSaveData.givenItemChecks.twinmoldDefeated == 0 ? 1 : 0; - default: - return 0; + switch (scene) { + case game::SceneId::OdolwaLair: + return gExtSaveData.givenItemChecks.odolwaDefeated == 0 ? 1 : 0; + case game::SceneId::GohtLair: + return gExtSaveData.givenItemChecks.gohtDefeated == 0 ? 1 : 0; + case game::SceneId::GyorgLair: + return gExtSaveData.givenItemChecks.gyorgDefeated == 0 ? 1 : 0; + case game::SceneId::TwinmoldLair: + return gExtSaveData.givenItemChecks.twinmoldDefeated == 0 ? 1 : 0; + default: + return 0; } } }