summaryrefslogtreecommitdiff
path: root/src/toBeSorted/misc_flag_managers.cpp
diff options
context:
space:
mode:
authorelijah-thomas774 <elijahthomas774@gmail.com>2024-04-27 14:54:26 -0400
committerelijah-thomas774 <elijahthomas774@gmail.com>2024-04-27 14:54:26 -0400
commitd8a92706433ab5597c06ac5d5a12c7243135f1ad (patch)
tree248ae8d1f8f9fa4af81021163b53a7804780dfc0 /src/toBeSorted/misc_flag_managers.cpp
parent44f75399e85793b5ea8ba699c37f180a738c0bb2 (diff)
fixed TBoxFlageManager::CopyFromSave - sceneIdx is signed
Diffstat (limited to 'src/toBeSorted/misc_flag_managers.cpp')
-rw-r--r--src/toBeSorted/misc_flag_managers.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/toBeSorted/misc_flag_managers.cpp b/src/toBeSorted/misc_flag_managers.cpp
index e908dd73..4abcd7f4 100644
--- a/src/toBeSorted/misc_flag_managers.cpp
+++ b/src/toBeSorted/misc_flag_managers.cpp
@@ -4,7 +4,6 @@
#include <toBeSorted/file_manager.h>
#include <toBeSorted/flag_space.h>
-
class CommittableFlagManager {
public:
bool mNeedsCommit;
@@ -47,7 +46,7 @@ public:
TBoxFlagManager();
virtual ~TBoxFlagManager() {}
void init();
- void copyFromSave(u16 sceneIndex);
+ void copyFromSave(s16 sceneIndex);
bool checkFlag(u16 sceneIndex, u16 flag);
virtual u16 getFlagCount() const;
void setFlag(u16 flag);
@@ -76,11 +75,11 @@ TBoxFlagManager::TBoxFlagManager() : CommittableFlagManager(false), mFlagSpace(s
void TBoxFlagManager::init() {}
-void TBoxFlagManager::copyFromSave(u16 sceneIndex) {
- // mr should be a clrlwi
- mSceneIndex = sceneIndex;
+void TBoxFlagManager::copyFromSave(s16 sceneIndex) {
+ u16 idx = sceneIndex;
+ mSceneIndex = idx;
u16 *flags = FileManager::getInstance()->getTBoxFlagsConst();
- mFlagSpace.copyFromSaveFile2(flags + (sceneIndex * 2), 0, 2);
+ mFlagSpace.copyFromSaveFile2(flags + (idx * 2), 0, 2);
}
bool TBoxFlagManager::checkFlag(u16 sceneIndex, u16 flag) {
@@ -144,9 +143,8 @@ bool EnemyDefeatManager::checkUncommittedFlag(u16 flag) {
}
}
-EnemyDefeatManager::EnemyDefeatManager() : CommittableFlagManager(false), mFlagSpace(sEnemyDefeatFlags, ARRAY_LENGTH(sEnemyDefeatFlags)) {
-
-}
+EnemyDefeatManager::EnemyDefeatManager()
+ : CommittableFlagManager(false), mFlagSpace(sEnemyDefeatFlags, ARRAY_LENGTH(sEnemyDefeatFlags)) {}
void EnemyDefeatManager::init() {
mSceneIndex = 0;