summaryrefslogtreecommitdiff
path: root/src/toBeSorted/misc_flag_managers.cpp
diff options
context:
space:
mode:
authorCovenEsme <84377742+CovenEsme@users.noreply.github.com>2024-05-24 14:37:17 +0100
committerCovenEsme <84377742+CovenEsme@users.noreply.github.com>2024-05-24 14:37:17 +0100
commitd9e22fe76db024e8f6b9ecddf174892147ad493a (patch)
tree4a99dceab8eab6b86585fe3453d315874ba9b4a0 /src/toBeSorted/misc_flag_managers.cpp
parentdb430ccc91fba6c5ef82907f6b59147d64a997a9 (diff)
Expand dAcBase work
Diffstat (limited to 'src/toBeSorted/misc_flag_managers.cpp')
-rw-r--r--src/toBeSorted/misc_flag_managers.cpp72
1 files changed, 1 insertions, 71 deletions
diff --git a/src/toBeSorted/misc_flag_managers.cpp b/src/toBeSorted/misc_flag_managers.cpp
index a3e8f264..1d941aa2 100644
--- a/src/toBeSorted/misc_flag_managers.cpp
+++ b/src/toBeSorted/misc_flag_managers.cpp
@@ -1,26 +1,10 @@
#include <common.h>
#include <libc.h>
+#include <toBeSorted/misc_flag_managers.h>
#include <toBeSorted/bitwise_flag_helper.h>
#include <toBeSorted/file_manager.h>
#include <toBeSorted/flag_space.h>
-class CommittableFlagManager {
-public:
- bool mNeedsCommit;
-
- virtual void doCommit() = 0;
- bool commitIfNecessary();
- void setNeedsCommit(bool commit) {
- mNeedsCommit = commit;
- }
- CommittableFlagManager() {
- mNeedsCommit = false;
- }
- CommittableFlagManager(bool commit) {
- mNeedsCommit = commit;
- }
-};
-
/* 0x800BE7B0 */
bool CommittableFlagManager::commitIfNecessary() {
if (mNeedsCommit) {
@@ -32,31 +16,6 @@ bool CommittableFlagManager::commitIfNecessary() {
}
}
-class TBoxFlagManager : public CommittableFlagManager {
-public:
- FlagSpace mFlagSpace;
- u16 mSceneIndex;
- BitwiseFlagHelper mFlagHelper;
-
- static u16 sTBoxFlags[2];
-
- static TBoxFlagManager *sInstance;
-
- virtual void doCommit() override;
- bool checkUncommittedFlag(u16 flag);
- TBoxFlagManager();
- virtual ~TBoxFlagManager() {}
- void init();
- void copyFromSave(s16 sceneIndex);
- bool checkFlag(u16 sceneIndex, u16 flag);
- virtual u16 getFlagCount() const;
- void setFlag(u16 flag);
- bool checkUncommittedFlag(u16 sceneIndex, u16 flag);
- u16 checkUncommittedFlag2(u16 flag) {
- return checkUncommittedFlag(flag);
- }
-};
-
TBoxFlagManager *TBoxFlagManager::sInstance = nullptr;
u16 TBoxFlagManager::sTBoxFlags[2] = {};
@@ -108,35 +67,6 @@ void TBoxFlagManager::setFlag(u16 flag) {
}
}
-// NOTE: Not actually Enemy Defeat.
-// This is a little more than that, it keeps track of live objects based on their id as a whole
-class EnemyDefeatManager : public CommittableFlagManager {
-public:
- FlagSpace mFlagSpace;
- BitwiseFlagHelper mFlagHelper;
- u16 mSceneIndex;
-
- static u16 sEnemyDefeatFlags[4096];
-
- static EnemyDefeatManager *sInstance;
-
- void clearSavedFlags();
- bool checkUncommittedFlag(u16 flag);
- u16 checkUncommittedFlag2(u16 flag) {
- return checkUncommittedFlag(flag);
- }
- EnemyDefeatManager();
- void init();
- void copyFromSave(u16 sceneIndex);
- void updateFlagIndex(u16 sceneIndex);
- void clearAll();
- bool checkIsValidFlag(u16 flag);
- bool checkFlag(u16 flag);
- virtual ~EnemyDefeatManager() {}
- virtual u16 getFlagCount() const;
- void setFlag(u16 flag);
-};
-
EnemyDefeatManager *EnemyDefeatManager::sInstance = nullptr;
u16 EnemyDefeatManager::sEnemyDefeatFlags[4096] = {};