mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-09-02 17:53:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Convert some singleton access to getters

Browse Source
This commit is contained in:
robojumper
2025-03-09 21:15:53 +01:00
parent a507d8fc0a
commit 31c9b92798
70 changed files with 352 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_cs_base.h
+5 -2
View File
@@ -17,8 +17,6 @@ public:
virtual int draw() override;
virtual int execute() override;
static dCsBase_c *sInstance;
int update();
int similarToDraw();
@@ -30,7 +28,12 @@ public:
return mStructC.field_0x14;
}
static dCsBase_c *GetInstance() {
return sInstance;
}
private:
static dCsBase_c *sInstance;
static int sfield0x700Init;
void setCurrentLyt(int lyt);
include/d/flag/dungeonflag_manager.h
+7 -6
View File
@@ -6,7 +6,7 @@
#include "toBeSorted/file_manager.h"
class DungeonflagManager {
public:
private:
bool mShouldCommit;
u16 mStageIndex;
FlagIndex *mpFlagIndex;
@@ -14,6 +14,9 @@ public:
static u16 sDungeonFlags[8];
public:
static DungeonflagManager *sInstance;
void copyFromSave(u32 flag);
void copyFromSave_Internal(u16 flagIndex);
void setCommitFlag(u16 flag);
@@ -27,16 +30,14 @@ public:
/** inline shenanigans to get copyFromSave to match */
static inline u16 *saveFilePtr(u16 flagIndex) {
u32 offset = (flagIndex & 0x1fff) * 8;
return FileManager::sInstance->getDungeonFlagsConst() + offset;
return FileManager::GetInstance()->getDungeonFlagsConst() + offset;
}
u16 getCounterOrFlag(u16 idx, u32 count) const {
u16 getCounterOrFlag(u32 idx, u32 count) const {
u16 offset = mStageIndex * 8;
const u16 *space = FileManager::sInstance->getDungeonFlagsConst() + offset;
const u16 *space = FileManager::GetInstance()->getDungeonFlagsConst() + offset;
return mpFlagIndex->getCounterOrFlag(idx, space, count);
}
static DungeonflagManager *sInstance;
};
#endif
include/d/flag/enemyflag_manager.h
+3 -2
View File
@@ -7,13 +7,14 @@
#include "toBeSorted/file_manager.h"
class EnemyflagManager : public CommittableFlagManager {
public:
private:
FlagSpace mFlagSpace;
BitwiseFlagHelper mFlagHelper;
u16 mSceneIndex;
static u16 sEnemyDefeatFlags[4096];
public:
static EnemyflagManager *sInstance;
void clearSavedFlags();
@@ -33,7 +34,7 @@ public:
void setFlag(u16 flag);
virtual void doCommit() override {
FileManager *mgr = FileManager::sInstance;
FileManager *mgr = FileManager::GetInstance();
mgr->setEnemyDefeatFlags(mFlagSpace.getFlagPtrUnchecked(), 0, 0x1000);
};
};
include/d/flag/itemflag_manager.h
+16 -15
View File
@@ -5,11 +5,11 @@
#include "d/flag/baseflag_manager.h"
#include "toBeSorted/file_manager.h"
class ItemflagManager : public ItemStoryManagerBase {
public:
private:
FlagSpace mItemFlags;
public:
ItemflagManager();
virtual ~ItemflagManager() {}
@@ -19,41 +19,42 @@ public:
mpFlagSpace = &mItemFlags;
}
/** 0x10 */ virtual void onDirty() override;
/** 0x14 */ virtual void copyFlagsFromSaveFirstTime();
/** 0x18 */ virtual void setupFlagIndex();
/** 0x1C */ virtual void doCommit() {
/** 0x14 */ virtual void copyFlagsFromSaveFirstTime() override;
/** 0x18 */ virtual void setupFlagIndex() override;
/** 0x1C */ virtual void doCommit() override {
u16 sz = mFlagCount;
u16 *flags = mpFlagSpace->getFlagPtrUnchecked();
FileManager::sInstance->setItemFlags(flags, 0, sz);
FileManager::GetInstance()->setItemFlags(flags, 0, sz);
}
/** 0x20 */ virtual void setFlag(u16 flag) {
/** 0x20 */ virtual void setFlag(u16 flag) override {
ItemStoryManagerBase::setFlag(flag & ~0x4000);
}
/** 0x24 */ virtual void unsetFlag(u16 flag) {
/** 0x24 */ virtual void unsetFlag(u16 flag) override {
ItemStoryManagerBase::unsetFlag(flag & ~0x4000);
}
/** 0x28 */ virtual void setFlagOrCounterToValue(u16 flag, u16 value) {
/** 0x28 */ virtual void setFlagOrCounterToValue(u16 flag, u16 value) override {
ItemStoryManagerBase::setFlagOrCounterToValue(flag & ~0x4000, value);
}
/** 0x2C */ virtual u16 getCounterOrFlag(u16 flag) const {
/** 0x2C */ virtual u16 getCounterOrFlag(u16 flag) const override {
return ItemStoryManagerBase::getCounterOrFlag(flag & ~0x4000);
}
/** 0x30 */ virtual u16 getUncommittedValue(u16 flag) {
/** 0x30 */ virtual u16 getUncommittedValue(u16 flag) override {
return ItemStoryManagerBase::getUncommittedValue(flag & ~0x4000);
}
/** 0x34 */ virtual u16 unk3(u16 arg) {
/** 0x34 */ virtual u16 unk3(u16 arg) override {
return ItemStoryManagerBase::unk3(arg & ~0x4000);
}
/** 0x38 */ virtual const u16 *getSaveFlagSpace() const {
return FileManager::sInstance->getItemFlagsConst();
/** 0x38 */ virtual const u16 *getSaveFlagSpace() const override {
return FileManager::GetInstance()->getItemFlagsConst();
};
u16 getFlagDirect(u16 flag) {
return ItemStoryManagerBase::getCounterOrFlag(flag);
}
public:
static ItemflagManager *sInstance;
private:
static u16 sFlags[0x40];
};
include/d/flag/sceneflag_manager.h
+6 -2
View File
@@ -5,9 +5,8 @@
#include "d/flag/bitwise_flag_helper.h"
#include "d/flag/flag_space.h"
class SceneflagManager {
public:
private:
FlagSpace mSceneflags;
FlagSpace mTempflags;
FlagSpace mZoneflags;
@@ -19,7 +18,12 @@ public:
static u16 sSceneFlags[8];
static u16 sZoneFlags[0xFC];
// helper
bool checkSceneflagHelper(u16 flag);
public:
static SceneflagManager *sInstance;
void init();
void setShouldCommit(u16 flag);
SceneflagManager();
include/d/flag/skipflag_manager.h
+1 -2
View File
@@ -1,7 +1,6 @@
#ifndef D_FLAG_SKIPFLAG_MANAGER_H
#define D_FLAG_SKIPFLAG_MANAGER_H
#include "d/flag/bitwise_flag_helper.h"
#include "d/flag/flag_space.h"
@@ -19,7 +18,7 @@ public:
private:
void doCopyFromSave();
static u16 sSkipFlags[16];
bool mShouldCommit;
include/d/flag/storyflag_manager.h
+4 -3
View File
@@ -23,19 +23,20 @@ public:
/** 0x1C */ virtual void doCommit() override {
u16 sz = mFlagCount;
u16 *flags = mpFlagSpace->getFlagPtrUnchecked();
FileManager::sInstance->setStoryFlags(flags, 0, sz);
FileManager::GetInstance()->setStoryFlags(flags, 0, sz);
}
/** 0x24 */ virtual void unsetFlag(u16 flag) override;
/** 0x38 */ virtual const u16 *getSaveFlagSpace() const override {
return FileManager::sInstance->getStoryFlagsConst();
return FileManager::GetInstance()->getStoryFlagsConst();
};
u16 getFlag(u16 flag) const {
return getCounterOrFlag(flag);
}
public:
static StoryflagManager *sInstance;
private:
static u16 sFlags[0x80];
};
include/d/flag/tboxflag_manager.h
+6 -1
View File
@@ -6,15 +6,20 @@
#include "d/flag/flag_space.h"
class TBoxflagManager : public CommittableFlagManager {
public:
private:
FlagSpace mFlagSpace;
u16 mSceneIndex;
BitwiseFlagHelper mFlagHelper;
static u16 sTBoxFlags[2];
public:
static TBoxflagManager *sInstance;
u16 checkFlagOnCurrentScene(u16 flag) {
return checkFlag(mSceneIndex, flag);
}
virtual void doCommit() override;
bool checkUncommittedFlag(u16 flag);
TBoxflagManager();
include/d/lyt/d_structd.h
+7 -3
View File
@@ -59,7 +59,8 @@ struct dLytStructDInArray {
};
struct dLytStructD : dLytStructD_Base {
dLytStructD() : field_0x18(0), field_0x1C(nullptr), field_0x20(0), field_0x22(0), field_0x23(0), field_0x24(nullptr) {}
dLytStructD()
: field_0x18(0), field_0x1C(nullptr), field_0x20(0), field_0x22(0), field_0x23(0), field_0x24(nullptr) {}
virtual u32 getType() override;
virtual void doSomething() override;
@@ -82,8 +83,6 @@ public:
dLytStructDList();
static dLytStructDList *create(EGG::Heap *heap);
static dLytStructDList *sInstance;
void appendToList1(dLytStructC *other);
void removeFromList1(dLytStructC *other);
@@ -92,7 +91,12 @@ public:
bool fn_80065A30(dLytStructD *other);
static dLytStructDList *GetInstance() {
return sInstance;
}
private:
static dLytStructDList *sInstance;
TList<dLytStructC, offsetof(dLytStructC, mLink)> mList1;
TList<dLytStructD, offsetof(dLytStructD, mLink)> mList2;
bool field_0x18;
include/d/lyt/meter/d_lyt_meter.h
+11 -4
View File
@@ -36,9 +36,10 @@ public:
virtual d2d::LytBase_c *getLyt() override {
return &mLyt;
}
virtual const char *getName() const {
virtual const char *getName() const override {
return mLyt.getName();
}
private:
STATE_FUNC_DECLARE(dLytMeter1Button_c, Wait);
STATE_FUNC_DECLARE(dLytMeter1Button_c, ToUse);
@@ -70,9 +71,10 @@ public:
virtual d2d::LytBase_c *getLyt() override {
return &mLyt;
}
virtual const char *getName() const {
virtual const char *getName() const override {
return mLyt.getName();
}
private:
STATE_FUNC_DECLARE(dLytMeter2Button_c, Wait);
STATE_FUNC_DECLARE(dLytMeter2Button_c, ToUse);
@@ -189,12 +191,15 @@ public:
bool remove();
bool draw();
static dLytMeterContainer_c *sInstance;
// FIXME This goes to doButton!!!
bool isButtonFlag(u32 flag) {
return (mMeter.field_0x13B38 & flag) == flag;
}
static dLytMeterContainer_c *GetInstance() {
return sInstance;
}
private:
/* 0x00004 */ d2d::ResAccIf_c mResAcc;
/* 0x00374 */ dLytMeterEventSkip_c *mpEventSkip;
@@ -203,6 +208,8 @@ private:
/* 0x13B40 */ LytDoButtonRelated *mpDoButtonRelated;
/* 0x13B44 */ LytBirdButtonRelated *mpBirdRelated;
/* 0x13B48 */ bool mVisible;
static dLytMeterContainer_c *sInstance;
};
#endif
include/d/t/d_t_sound_area_mgr.h
+5 -2
View File
@@ -16,13 +16,16 @@ public:
virtual int doDelete() override;
virtual int create() override;
static dTgSndMg_c *sInstance;
void setBgmFlag(int flag) {
mBgmFlags |= 1 << flag;
}
static dTgSndMg_c *GetInstance() {
return sInstance;
}
private:
static dTgSndMg_c *sInstance;
u32 mBgmFlags;
};
include/m/m3d/m_shadow.h
+13 -3
View File
@@ -108,8 +108,14 @@ class mShadow_c : public proc_c {
public:
mShadow_c(EGG::Heap *heap)
: mpHeap(heap), mpCurrentHeap(nullptr), mpChilds(nullptr), mpTexBuf(nullptr), mpCallback(nullptr),
mCurrentHeapIdx(0), mFreeChildIdx(0), field_0x66(true) {
: mpHeap(heap),
mpCurrentHeap(nullptr),
mpChilds(nullptr),
mpTexBuf(nullptr),
mpCallback(nullptr),
mCurrentHeapIdx(0),
mFreeChildIdx(0),
field_0x66(true) {
nw4r::ut::List_Init(&mList, 0);
}
virtual ~mShadow_c();
@@ -148,9 +154,13 @@ public:
static void create(const mShadowCircleConfig *, nw4r::g3d::ResMdl mdl, EGG::Heap *heap);
static void destroy();
static mShadow_c *sInstance;
static mShadow_c *GetInstance() {
return sInstance;
}
private:
static mShadow_c *sInstance;
/* 0x18 */ EGG::Heap *mpHeap;
/* 0x1C */ mAllocator_c mAllocator;
/* 0x38 */ EGG::FrmHeap *mpFrmHeaps[2];
include/toBeSorted/arc_managers/current_stage_arc_manager.h
+6 -2
View File
@@ -10,8 +10,6 @@ public:
CurrentStageArcManager();
virtual ~CurrentStageArcManager();
static CurrentStageArcManager *sInstance;
static bool create(EGG::Heap *heap);
void init(EGG::Heap *heap);
@@ -36,7 +34,13 @@ public:
return mArcTable.ensureAllEntriesLoaded();
}
static CurrentStageArcManager *GetInstance() {
return sInstance;
}
private:
static CurrentStageArcManager *sInstance;
SizedString<32> mStageName;
SizedString<32> mCurrentLoadingStageArcName;
SizedString<32> mStageExtraLayerArcName;
include/toBeSorted/arc_managers/layout_arc_manager.h
+5 -2
View File
@@ -10,8 +10,6 @@ public:
LayoutArcManager();
virtual ~LayoutArcManager();
static LayoutArcManager *sInstance;
static bool create(EGG::Heap *heap);
void init(EGG::Heap *heap);
@@ -28,7 +26,12 @@ public:
void *getData(const char *oarcName, const char *fileName);
void *getLoadedData(const char *path);
static LayoutArcManager *GetInstance() {
return sInstance;
}
private:
static LayoutArcManager *sInstance;
dRawArcTable_c mArcTable;
};
include/toBeSorted/arc_managers/oarc_manager.h
+5 -2
View File
@@ -9,8 +9,6 @@ public:
OarcManager();
virtual ~OarcManager();
static OarcManager *sInstance;
static bool create(EGG::Heap *heap);
void init(EGG::Heap *heap);
@@ -34,7 +32,12 @@ public:
void *getPlcFromArc(const char *oarcName, const char *fileName);
void *getSubEntryData(const char *oarcName, const char *fileName);
static OarcManager *GetInstance() {
return sInstance;
}
private:
static OarcManager *sInstance;
dRawArcTable_c mArcTable;
};
include/toBeSorted/attention.h
+6 -2
View File
@@ -161,9 +161,15 @@ public:
AttentionManager();
/* vt at 0xBDC */ virtual ~AttentionManager();
static AttentionManager *GetInstance() {
return sInstance;
}
private:
/* 0xBDC */ u8 field_0xBDC;
static AttentionManager *sInstance;
public:
bool create();
bool createHeap();
@@ -205,8 +211,6 @@ public:
void addReadTarget(dAcObjBase_c &actor, u32 flags, f32 field_0x14, f32 ignored, f32 field_0x20, f32 field_0x24);
void addReadTarget2(dAcObjBase_c &actor, u32 flags, f32 field_0x14, f32 field_0x20, f32 field_0x24);
static AttentionManager *sInstance;
private:
bool isInNormalGameState() const;
bool checkZButtonPressed() const;
include/toBeSorted/file_manager.h
+3 -1
View File
@@ -281,9 +281,11 @@ public:
/* 800116C0 */ static void getRegionVersion(char *out);
// /* 800116F0 */ void sinit();
static FileManager *getInstance() {
static FileManager *GetInstance() {
return sInstance;
}
private:
static FileManager *sInstance;
};
include/toBeSorted/nand_request_thread.h
+2 -2
View File
@@ -87,7 +87,7 @@ struct NandRequestWriteHolder : public NandRequestHolderBase {
};
class NandRequestThread : EGG::Thread {
friend NandRequest;
friend class NandRequest;
public:
NandRequestThread(
@@ -103,7 +103,7 @@ public:
int priority, EGG::Heap *commandHeap, void *bufFromGameHeap, size_t bufSize, void *mThreadArg, EGG::Heap *heap
);
static NandRequestThread *getInstance() {
static NandRequestThread *GetInstance() {
return sInstance;
}
include/toBeSorted/special_item_drop_mgr.h
+6 -1
View File
@@ -24,9 +24,14 @@ enum SpecialItemDropTable {
};
class SpecialItemDropMgr {
public:
private:
static SpecialItemDropMgr *sInstance;
public:
static SpecialItemDropMgr *GetInstance() {
return sInstance;
}
SpecialItemDropMgr();
virtual ~SpecialItemDropMgr() {}
include/toBeSorted/time_area_mgr.h
+6 -2
View File
@@ -59,8 +59,6 @@ public:
f32 checkPositionIsInPastState(s32 roomId, const mVec3_c &position, float *, float);
bool fn_800B9B60(s32 roomId, const mVec3_c &position);
static dTimeAreaMgr_c *sInstance;
bool isInLanayruMiningFacility() const {
return mIsInLanayruMiningFacility;
}
@@ -77,7 +75,13 @@ public:
field_0x7A = val;
}
static dTimeAreaMgr_c *GetInstance() {
return sInstance;
}
private:
static dTimeAreaMgr_c *sInstance;
/* 0x04 */ u8 field_0x04[0x0C - 0x04];
/* 0x0C */ mHeapAllocator_c mAllocator;
/* 0x28 */ dTimeAreaMgrProcA_c mProcA;
src/REL/d/a/d_a_bombf.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ int dAcBombf_c::actorPostCreate() {
}
if (field_0x3D2 == 0 || field_0x3D2 == 2) {
bool b = dTimeAreaMgr_c::sInstance->fn_800B9B60(roomid, position);
bool b = dTimeAreaMgr_c::GetInstance()->fn_800B9B60(roomid, position);
if (b) {
mTimeAreaStruct.field_0x00 = 1.0f;
}
src/REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp
+2 -2
View File
@@ -55,7 +55,7 @@ int dAcOFruitGutsLeaf_c::actorCreate() {
}
int dAcOFruitGutsLeaf_c::actorPostCreate() {
if (hideInPast() && !dTimeAreaMgr_c::sInstance->fn_800B9B60(roomid, position)) {
if (hideInPast() && !dTimeAreaMgr_c::GetInstance()->fn_800B9B60(roomid, position)) {
mScale.x = 0.0f;
mScale.y = 0.0f;
mScale.z = 0.0f;
@@ -69,7 +69,7 @@ int dAcOFruitGutsLeaf_c::actorPostCreate() {
}
int dAcOFruitGutsLeaf_c::actorExecute() {
if (hideInPast()) {
if (dTimeAreaMgr_c::sInstance->fn_800B9B60(roomid, position)) {
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(roomid, position)) {
if (mScale.x != 1.0f) {
sLib::chase(&mScale.x, 1.0f, 0.05f);
mScale.z = mScale.x;
src/REL/d/a/obj/d_a_obj_seat_sword.cpp
+1 -1
View File
@@ -194,7 +194,7 @@ int dAcOSeatSword_c::draw() {
void dAcOSeatSword_c::initializeState_Wait() {}
void dAcOSeatSword_c::executeState_Wait() {
AttentionManager::sInstance->addTarget(*this, sInteractionDef, 0, nullptr);
AttentionManager::GetInstance()->addTarget(*this, sInteractionDef, 0, nullptr);
if (checkPlayerHasSword()) {
mbNoSword = true;
src/REL/d/a/obj/d_a_obj_stage_cover.cpp
+1 -1
View File
@@ -8,7 +8,7 @@ SPECIAL_ACTOR_PROFILE(OBJ_STAGE_COVER, dAcOstageCover_c, fProfile::OBJ_STAGE_COV
STATE_DEFINE(dAcOstageCover_c, Wait);
bool dAcOstageCover_c::createHeap() {
mBrres = nw4r::g3d::ResFile(CurrentStageArcManager::sInstance->getData("g3d/stage.brres"));
mBrres = nw4r::g3d::ResFile(CurrentStageArcManager::GetInstance()->getData("g3d/stage.brres"));
nw4r::g3d::ResMdl mdl = mBrres.GetResMdl("StageCover");
TRY_CREATE(mModel.create(mdl, &heap_allocator, 0x120));
return true;
src/REL/d/a/obj/d_a_obj_sun_light.cpp
+1 -1
View File
@@ -10,7 +10,7 @@ SPECIAL_ACTOR_PROFILE(OBJ_SUN_LIGHT, dAcOsunLight_c, fProfile::OBJ_SUN_LIGHT, 0x
STATE_DEFINE(dAcOsunLight_c, Wait);
bool dAcOsunLight_c::createHeap() {
mBrres = nw4r::g3d::ResFile(CurrentStageArcManager::sInstance->getData("g3d/stage.brres"));
mBrres = nw4r::g3d::ResFile(CurrentStageArcManager::GetInstance()->getData("g3d/stage.brres"));
dStage_c::bindStageResToFile(&mBrres);
dStage_c::bindSkyCmnToResFile(&mBrres);
nw4r::g3d::ResMdl mdl = mBrres.GetResMdl("StageF000Light");
src/REL/d/a/obj/d_a_obj_time_stage_bg.cpp
+3 -3
View File
@@ -27,7 +27,7 @@ static const char *sMdl2Names[] = {
STATE_DEFINE(dAcOTimeStageBg_c, Wait);
bool dAcOTimeStageBg_c::createHeap() {
mRes = nw4r::g3d::ResFile(CurrentStageArcManager::sInstance->getData("g3d/stage.brres"));
mRes = nw4r::g3d::ResFile(CurrentStageArcManager::GetInstance()->getData("g3d/stage.brres"));
nw4r::g3d::ResMdl mdl = mRes.GetResMdl(sMdlNames[mSubType]);
TRY_CREATE(mMdl1.create(mdl, &heap_allocator, 0x128));
nw4r::g3d::ResNode nd = mdl.GetResNode(sMdlNames[mSubType]);
@@ -80,7 +80,7 @@ int dAcOTimeStageBg_c::actorCreate() {
int dAcOTimeStageBg_c::actorPostCreate() {
mTimeArea.check(roomid, field_0x3EC, 0, 30.0f, 0.1f);
if (dTimeAreaMgr_c::sInstance->fn_800B9B60(roomid, field_0x3EC)) {
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(roomid, field_0x3EC)) {
field_0x3F8 = 255.0f;
} else {
field_0x3F8 = 0.0f;
@@ -117,7 +117,7 @@ void dAcOTimeStageBg_c::initializeState_Wait() {}
void dAcOTimeStageBg_c::executeState_Wait() {
f32 target = 0.0f;
mTimeArea.check(roomid, field_0x3EC, 0, 30.0f, 0.1f);
if (dTimeAreaMgr_c::sInstance->fn_800B9B60(roomid, field_0x3EC)) {
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(roomid, field_0x3EC)) {
if (mTimeArea.getDistMaybe() == 1.0f) {
target = 255.0f;
}
src/REL/d/a/obj/d_a_obj_toD3_stone_figure.cpp
+3 -3
View File
@@ -133,13 +133,13 @@ void dAcOtoD3StoneFigure_c::initializeState_OneEye() {
void dAcOtoD3StoneFigure_c::executeState_OneEye() {
if (EventManager::isInEvent(this, "D3OpenStart")) {
dScGame_c::sInstance->triggerExit(roomid, mExitId);
dScGame_c::GetInstance()->triggerExit(roomid, mExitId);
} else {
if (hasStoneOfTrials() && dScGame_c::currentSpawnInfo.getTimeOfDay() != SpawnInfo::NIGHT) {
// These are interaction related
-0.0f;
AttentionManager::sInstance->addExamineTalkTarget(*this, 1, 300.0f, 50.0f, -100.0f, 100.0f);
AttentionManager::sInstance->addExamineTalkTarget(*this, 1, 200.0f, -100.0f, 100.0f);
AttentionManager::GetInstance()->addExamineTalkTarget(*this, 1, 300.0f, 50.0f, -100.0f, 100.0f);
AttentionManager::GetInstance()->addExamineTalkTarget(*this, 1, 200.0f, -100.0f, 100.0f);
}
}
}
src/REL/d/a/obj/d_a_obj_tubo.cpp
+2 -2
View File
@@ -392,7 +392,7 @@ void dAcOtubo_c::executeState_Slope() {
void dAcOtubo_c::finalizeState_Slope() {}
void dAcOtubo_c::initializeState_Rebirth() {
SpecialItemDropMgr *mgr = SpecialItemDropMgr::sInstance;
SpecialItemDropMgr *mgr = SpecialItemDropMgr::GetInstance();
mgr->giveSpecialDropItem(getParams2UpperByte(), roomid, &position, 0, rotation.y, -1);
mField_0x9AC = position;
obj_pos = &mField_0x9AC;
@@ -733,7 +733,7 @@ void dAcOtubo_c::fn_272_3020() {
void dAcOtubo_c::addPickupTarget() {
if (cM::isZero(forwardSpeed)) {
AttentionManager *ins = AttentionManager::sInstance;
AttentionManager *ins = AttentionManager::GetInstance();
ins->addPickUpTarget(*this, 120.f);
ins->addUnk3Target(*this, 1, 500.f, -200.f, 200.f);
}
src/REL/d/a/obj/d_a_obj_uta_demo_pedest.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ bool dAcOutaDemoPedest_c::createHeap() {
mModelType = 0;
}
mRes = nw4r::g3d::ResFile(CurrentStageArcManager::sInstance->getData("g3d/stage.brres"));
mRes = nw4r::g3d::ResFile(CurrentStageArcManager::GetInstance()->getData("g3d/stage.brres"));
dStage_c::bindStageResToFile(&mRes);
dStage_c::bindSkyCmnToResFile(&mRes);
nw4r::g3d::ResMdl mdl = mRes.GetResMdl(sMdlNames[mModelType]);
src/REL/d/d_s_boot.cpp
+28 -28
View File
@@ -47,30 +47,30 @@ extern "C" u8 fn_80054F30();
extern "C" nw4r::ut::ResFont *lbl_805750D8;
sFPhaseBase::sFPhaseState dScBoot_c::cb1() {
LayoutArcManager::sInstance->loadLayoutArcFromDisk("cursor", mHeap::g_archiveHeap);
LayoutArcManager::sInstance->loadLayoutArcFromDisk("CursorStick", mHeap::g_archiveHeap);
LayoutArcManager::sInstance->loadLayoutArcFromDisk("System2D", nullptr);
LayoutArcManager::sInstance->loadLayoutArcFromDisk("saveBannerU", nullptr);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk("cursor", mHeap::g_archiveHeap);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk("CursorStick", mHeap::g_archiveHeap);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk("System2D", nullptr);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk("saveBannerU", nullptr);
for (int i = 0; i < 6; i++) {
SizedString<128> str;
str.sprintf("%s/%s", getUsedLanguageString(), getEventFlowFileNameByIndex(i, 1));
OarcManager::sInstance->loadObjectArcFromDisk(str, mHeap::g_archiveHeap);
OarcManager::GetInstance()->loadObjectArcFromDisk(str, mHeap::g_archiveHeap);
}
OarcManager::sInstance->loadObjectArcFromDisk("System", mHeap::g_archiveHeap);
OarcManager::GetInstance()->loadObjectArcFromDisk("System", mHeap::g_archiveHeap);
return sFPhaseBase::PHASE_NEXT;
}
sFPhaseBase::sFPhaseState dScBoot_c::cb2() {
if (OarcManager::sInstance->ensureAllEntriesLoaded()) {
if (OarcManager::GetInstance()->ensureAllEntriesLoaded()) {
return sFPhaseBase::PHASE_RETRY;
}
if (LayoutArcManager::sInstance->ensureAllEntriesLoaded()) {
if (LayoutArcManager::GetInstance()->ensureAllEntriesLoaded()) {
return sFPhaseBase::PHASE_RETRY;
}
TPLPalette *tpl =
static_cast<TPLPalette *>(LayoutArcManager::sInstance->getData("saveBannerU", "tmp/saveBanner.tpl"));
static_cast<TPLPalette *>(LayoutArcManager::GetInstance()->getData("saveBannerU", "tmp/saveBanner.tpl"));
TPLBind(tpl);
return sFPhaseBase::PHASE_NEXT;
@@ -107,10 +107,10 @@ sFPhaseBase::sFPhaseState dScBoot_c::cb5() {
sFPhaseBase::sFPhaseState dScBoot_c::cb6() {
dDyl::initRelsArc();
OarcManager::sInstance->loadObjectArcFromDisk("JpaCommon", dHeap::workExHeap.heap);
LayoutArcManager::sInstance->loadLayoutArcFromDisk("Main2D", nullptr);
LayoutArcManager::sInstance->loadLayoutArcFromDisk("DoButton", nullptr);
LayoutArcManager::sInstance->loadLayoutArcFromDisk("MenuHelp", nullptr);
OarcManager::GetInstance()->loadObjectArcFromDisk("JpaCommon", dHeap::workExHeap.heap);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk("Main2D", nullptr);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk("DoButton", nullptr);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk("MenuHelp", nullptr);
u8 result = fn_80054F30();
s32 gameOverType;
if (result == 3) {
@@ -120,15 +120,15 @@ sFPhaseBase::sFPhaseState dScBoot_c::cb6() {
}
if (gameOverType == 0) {
LayoutArcManager::sInstance->loadLayoutArcFromDisk("gameOver_01", nullptr);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk("gameOver_01", nullptr);
} else if (gameOverType == 1) {
LayoutArcManager::sInstance->loadLayoutArcFromDisk("gameOver_02", nullptr);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk("gameOver_02", nullptr);
} else {
LayoutArcManager::sInstance->loadLayoutArcFromDisk("gameOver_03", nullptr);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk("gameOver_03", nullptr);
}
if (OarcManager::sInstance->checkIfObjectArcExistsOnDisk("ObjectPack")) {
OarcManager::sInstance->loadObjectArcFromDisk("ObjectPack", mHeap::g_archiveHeap);
if (OarcManager::GetInstance()->checkIfObjectArcExistsOnDisk("ObjectPack")) {
OarcManager::GetInstance()->loadObjectArcFromDisk("ObjectPack", mHeap::g_archiveHeap);
} else {
static const char *OBJECT_PACK_OARCS[] = {
"Camera",
@@ -231,7 +231,7 @@ sFPhaseBase::sFPhaseState dScBoot_c::cb6() {
"Bc",
};
for (int i = 0; i < ARRAY_LENGTH(OBJECT_PACK_OARCS); i++) {
OarcManager::sInstance->loadObjectArcFromDisk(OBJECT_PACK_OARCS[i], mHeap::g_archiveHeap);
OarcManager::GetInstance()->loadObjectArcFromDisk(OBJECT_PACK_OARCS[i], mHeap::g_archiveHeap);
}
}
@@ -266,18 +266,18 @@ sFPhaseBase::sFPhaseState dScBoot_c::cb7() {
return sFPhaseBase::PHASE_RETRY;
}
if (OarcManager::sInstance->ensureAllEntriesLoaded()) {
if (OarcManager::GetInstance()->ensureAllEntriesLoaded()) {
return sFPhaseBase::PHASE_RETRY;
}
if (LayoutArcManager::sInstance->ensureAllEntriesLoaded()) {
if (LayoutArcManager::GetInstance()->ensureAllEntriesLoaded()) {
return sFPhaseBase::PHASE_RETRY;
}
// TODO JParticle monkaS
OarcManager::sInstance->getData("System", "dat/navi_table.dat");
OarcManager::sInstance->getData("JpaCommon", "dat/Common.jpc");
OarcManager::sInstance->getData("JpaCommon", "dat/Common.jpn");
OarcManager::GetInstance()->getData("System", "dat/navi_table.dat");
OarcManager::GetInstance()->getData("JpaCommon", "dat/Common.jpc");
OarcManager::GetInstance()->getData("JpaCommon", "dat/Common.jpn");
return sFPhaseBase::PHASE_NEXT;
}
@@ -318,16 +318,16 @@ dScBoot_c::strap_c::strap_c() {
mArcName.sprintf("strap%s", str);
mStr2.sprintf("strap_00_%s.brlyt", str);
mStr3.sprintf("strap_00_%s_loop.brlan", str);
LayoutArcManager::sInstance->loadLayoutArcFromDisk(mArcName, dHeap::work2Heap.heap);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk(mArcName, dHeap::work2Heap.heap);
field_0x4EC = 0;
}
bool dScBoot_c::strap_c::create() {
if (!field_0x4EC) {
if (LayoutArcManager::sInstance->ensureLoaded1(mArcName)) {
if (LayoutArcManager::GetInstance()->ensureLoaded1(mArcName)) {
return false;
}
void *data = LayoutArcManager::sInstance->getLoadedData(mArcName);
void *data = LayoutArcManager::GetInstance()->getLoadedData(mArcName);
// HACK: Why does this use the m2d attach function?
// Inlines break instruction scheduling, and I don't
// want to undo shadowing...
@@ -349,7 +349,7 @@ bool dScBoot_c::strap_c::remove() {
mAnm.destroySomething();
// HACK: See above
((m2d::ResAccIf_c *)&mResAcc)->detach();
LayoutArcManager::sInstance->decrement(mArcName);
LayoutArcManager::GetInstance()->decrement(mArcName);
return true;
}
src/REL/d/t/d_t_genki_dws_tgt.cpp
+1 -1
View File
@@ -10,7 +10,7 @@ SPECIAL_ACTOR_PROFILE(TAG_GENKI_DOWSING_TARGET, dTgGenkiDwsTgt_c, fProfile::TAG_
int dTgGenkiDwsTgt_c::create() {
u16 batQuestActivated = StoryflagManager::sInstance->getCounterOrFlag(304);
if (batQuestActivated == 0 || !dScGame_c::sInstance->currentSpawnInfo.isNight()) {
if (batQuestActivated == 0 || !dScGame_c::GetInstance()->currentSpawnInfo.isNight()) {
return FAILED;
}
src/REL/d/t/d_t_sound_area.cpp
+3 -3
View File
@@ -15,7 +15,7 @@ void float_ordering() {
int dTgSndAr_c::create() {
mScale *= 0.01f;
if (dTgSndMg_c::sInstance == nullptr) {
if (dTgSndMg_c::GetInstance() == nullptr) {
dAcObjBase_c::createActorUnkGroup3(fProfile::SOUND_AREA_MGR, roomid, 0, nullptr, nullptr, nullptr, -1);
}
@@ -59,8 +59,8 @@ int dTgSndAr_c::actorExecute() {
}
if (lbl_80575D58 != nullptr) {
mVec3_c pos = lbl_80575D58->v;
if (checkPosInArea(pos) && dTgSndMg_c::sInstance != nullptr) {
dTgSndMg_c::sInstance->setBgmFlag(params & 0xFF);
if (checkPosInArea(pos) && dTgSndMg_c::GetInstance() != nullptr) {
dTgSndMg_c::GetInstance()->setBgmFlag(params & 0xFF);
}
}
return SUCCEEDED;
src/REL/d/t/d_t_time_area_check.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ int dTgTimeAreaCheck_c::doDelete() {
}
int dTgTimeAreaCheck_c::actorExecute() {
f32 result = dTimeAreaMgr_c::sInstance->checkPositionIsInPastState(roomid, position, nullptr, 10.0f);
f32 result = dTimeAreaMgr_c::GetInstance()->checkPositionIsInPastState(roomid, position, nullptr, 10.0f);
if (result > 0.0f) {
if (mPastSceneFlag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(roomid, mPastSceneFlag)) {
SceneflagManager::sInstance->setFlag(roomid, mPastSceneFlag);
src/d/a/d_a_base.cpp
+2 -2
View File
@@ -243,7 +243,7 @@ u32 dAcBase_c::itemDroppingAndGivingRelated(mVec3_c *spawnPos, int subtype) {
u32 param2Copy = params2;
params2 = param2Copy | 0xFF000000;
// mAng3_c rot = {};
return SpecialItemDropMgr::sInstance->giveSpecialDropItem(param2Copy >> 0x18, roomid, spawnPos, subtype, 0, -1);
return SpecialItemDropMgr::GetInstance()->giveSpecialDropItem(param2Copy >> 0x18, roomid, spawnPos, subtype, 0, -1);
}
// 8002cf90
@@ -574,7 +574,7 @@ void dAcBase_c::incrementKillCounter() {
int killCounterId = object->targetFiTextId;
if (killCounterId < 91 && (killCounterId & 0x300) == 0) {
FileManager *fileMgr = FileManager::sInstance;
FileManager *fileMgr = FileManager::GetInstance();
u16 killCount = fileMgr->getEnemyKillCount(killCounterId) + 1;
fileMgr->setEnemyKillCount(killCounterId, killCount);
}
src/d/a/d_a_insect.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ void dAcOInsect_c::addAttentionTarget() {
preAttention();
static InteractionTargetDef tmpTarget = {1, 0, 0, UNK_18, 0x2, 150.0f, 0.0f, 0.0f, -300.0f, 100.0f, 50.0f, 1.0f};
if (shouldAddAttentionTarget()) {
AttentionManager *attn = AttentionManager::sInstance;
AttentionManager *attn = AttentionManager::GetInstance();
if (attn != nullptr) {
attn->addCatchTarget(*this, 0x1, 400.0f, -200.0f, 200.0f);
tmpTarget.field_0x14 = getAttentionField();
src/d/a/d_a_item.cpp
+4 -6
View File
@@ -272,12 +272,10 @@ bool dAcItemBase_c::setDungeonFlagForTear(int tearNum) {
if (!getFlagIdxForTear(tearNum, &flag_idx)) {
return false;
}
// idk
int idx = DungeonflagManager::sInstance->mStageIndex;
const u16 *pData = FileManager::sInstance->getDungeonFlagsConst() + ((idx & 0x1FFF) * 4);
u32 counterMask = DungeonflagManager::sInstance->mpFlagIndex->getCounterOrFlag(flag_idx, pData, 8);
u32 tearMask = getTearBit(tearNum);
DungeonflagManager::sInstance->setToValue(flag_idx, tearMask | counterMask);
u16 oldVal = DungeonflagManager::sInstance->getCounterOrFlag(flag_idx, 8);
u16 tearBit = getTearBit(tearNum);
u16 newVal = tearBit | oldVal;
DungeonflagManager::sInstance->setToValue(flag_idx, newVal);
return true;
}
src/d/a/obj/d_a_obj_tbox.cpp
+7 -7
View File
@@ -1167,7 +1167,7 @@ int dAcTbox_c::doDelete() {
field_0x1210 = 0;
}
if (sCurrentObtainingItemOarcName != nullptr) {
OarcManager *mng = OarcManager::sInstance;
OarcManager *mng = OarcManager::GetInstance();
if (!mng->ensureLoaded1(sCurrentObtainingItemOarcName)) {
mng->decrement(sCurrentObtainingItemOarcName);
sCurrentObtainingItemOarcName = nullptr;
@@ -1827,7 +1827,7 @@ void dAcTbox_c::initializeState_WaitOpen() {
}
void dAcTbox_c::executeState_WaitOpen() {
if ((!mDoObstructedCheck || checkIsClear()) && fn_8026D120()) {
AttentionManager *mgr = AttentionManager::sInstance;
AttentionManager *mgr = AttentionManager::GetInstance();
mgr->addTarget(*this, getInteractionTargetDef(), 0, nullptr);
}
}
@@ -1858,7 +1858,7 @@ void dAcTbox_c::initializeState_GoddessWaitOn() {
}
void dAcTbox_c::executeState_GoddessWaitOn() {
if (fn_8026D120()) {
AttentionManager *mgr = AttentionManager::sInstance;
AttentionManager *mgr = AttentionManager::GetInstance();
mgr->addTarget(*this, getInteractionTargetDef(), 0, nullptr);
}
}
@@ -1888,7 +1888,7 @@ void dAcTbox_c::initializeState_DeleteArchive() {
}
void dAcTbox_c::executeState_DeleteArchive() {
if (sCurrentObtainingItemOarcName != nullptr) {
OarcManager *mng = OarcManager::sInstance;
OarcManager *mng = OarcManager::GetInstance();
if (!mng->ensureLoaded1(sCurrentObtainingItemOarcName)) {
mng->decrement(sCurrentObtainingItemOarcName);
sCurrentObtainingItemOarcName = nullptr;
@@ -1919,7 +1919,7 @@ void dAcTbox_c::initializeState_LoadArchive() {
}
fn_8026D140();
sCurrentObtainingItemOarcName = sItemToArchiveName[mItemModelIdx];
OarcManager::sInstance->loadObjectArcFromDisk(sCurrentObtainingItemOarcName, nullptr);
OarcManager::GetInstance()->loadObjectArcFromDisk(sCurrentObtainingItemOarcName, nullptr);
field_0x11C0.set(-61.0f, 0.0f, -42.0f);
field_0x11CC.set(61.0f, 100.0f, 42.0f);
field_0x11E8 = 1.0f;
@@ -1927,7 +1927,7 @@ void dAcTbox_c::initializeState_LoadArchive() {
field_0x120C = 0;
}
void dAcTbox_c::executeState_LoadArchive() {
if (!OarcManager::sInstance->ensureLoaded1(sCurrentObtainingItemOarcName)) {
if (!OarcManager::GetInstance()->ensureLoaded1(sCurrentObtainingItemOarcName)) {
mStateMgr.changeState(StateID_Open);
}
}
@@ -2272,7 +2272,7 @@ void dAcTbox_c::setTboxFlag() {
bool dAcTbox_c::checkTboxFlag() const {
if (field_0x1207 <= 0x1F) {
return TBoxflagManager::sInstance->checkFlag(TBoxflagManager::sInstance->mSceneIndex, field_0x1207);
return TBoxflagManager::sInstance->checkFlagOnCurrentScene(field_0x1207);
}
return false;
}
src/d/col/bg/d_bg_s.cpp
+4 -4
View File
@@ -405,7 +405,7 @@ void dBgS::Ct() {
}
// TODO
OarcManager::sInstance->getData(common_folder, MAP_GRADATION_FILE);
OarcManager::GetInstance()->getData(common_folder, MAP_GRADATION_FILE);
mInSkyKeep = false;
for (int i = 0; i < 8; ++i) {
@@ -1004,7 +1004,7 @@ mVec3_c dBgS_GetN(cBgS_PolyInfo const &info) {
}
void dBgS::UpdateScrollTex() {
MapSrollText_t *scrollTex = (MapSrollText_t *)OarcManager::sInstance->getData(common_folder, MAP_SCROLL_TEX_FILE);
MapSrollText_t *scrollTex = (MapSrollText_t *)OarcManager::GetInstance()->getData(common_folder, MAP_SCROLL_TEX_FILE);
for (int i = 0; i < 5; ++i, ++scrollTex) {
if (++mField_0x3864[i] >= scrollTex->mField_0x0E) {
mField_0x3864[i] = 0;
@@ -1133,13 +1133,13 @@ void dBgS::InitMapParts() {
for (int i = 0; i < 31; ++i) {
if (MAP_SOLID_MATERIAL_NAMES[i]) {
spSolidMatTex[i] = OarcManager::sInstance->getData(common_folder, MAP_SOLID_MATERIAL_NAMES[i]);
spSolidMatTex[i] = OarcManager::GetInstance()->getData(common_folder, MAP_SOLID_MATERIAL_NAMES[i]);
} else {
spSolidMatTex[i] = nullptr;
}
}
for (int i = 0; i < 5; ++i) {
spScrollMapTex[i] = OarcManager::sInstance->getData(common_folder, MAP_SCROLL_MATERIAL_NAMES[i]);
spScrollMapTex[i] = OarcManager::GetInstance()->getData(common_folder, MAP_SCROLL_MATERIAL_NAMES[i]);
}
}
src/d/d_cs_base.cpp
+3 -3
View File
@@ -33,7 +33,7 @@ int dCsBase_c::sfield0x700Init = 0;
#pragma explicit_zero_data off
int dCsBase_c::create() {
void *data = LayoutArcManager::sInstance->getLoadedData("cursor");
void *data = LayoutArcManager::GetInstance()->getLoadedData("cursor");
mResAcc.attach(data, "arc");
for (int i = 0; i < 2; i++) {
@@ -44,7 +44,7 @@ int dCsBase_c::create() {
}
setCurrentLyt(0);
mStructC.field_0x10 = 1;
d2d::dLytStructDList::sInstance->appendToList1(&mStructC);
d2d::dLytStructDList::GetInstance()->appendToList1(&mStructC);
fn_8016B2B0();
field_0x6F0 = 0.0f;
field_0x6F4 = 0.0f;
@@ -59,7 +59,7 @@ int dCsBase_c::create() {
}
int dCsBase_c::doDelete() {
d2d::dLytStructDList::sInstance->removeFromList1(&mStructC);
d2d::dLytStructDList::GetInstance()->removeFromList1(&mStructC);
fn_8016B2E0();
mResAcc.detach();
return SUCCEEDED;
src/d/d_cs_game.cpp
+5 -5
View File
@@ -131,9 +131,9 @@ dCsGame_c::~dCsGame_c() {
}
int dCsGame_c::create() {
void *csData = LayoutArcManager::sInstance->getLoadedData("cursor");
void *csData = LayoutArcManager::GetInstance()->getLoadedData("cursor");
mCursorResAcc.attach(csData, "arc");
void *mainData = LayoutArcManager::sInstance->getLoadedData("Main2D");
void *mainData = LayoutArcManager::GetInstance()->getLoadedData("Main2D");
mMain2DResAcc.attach(mainData, "");
mLyt1.setResAcc(&mCursorResAcc);
@@ -148,8 +148,8 @@ int dCsGame_c::create() {
mCursor.setField0x9A0(0);
mStructC.field_0x10 = 2;
d2d::dLytStructDList::sInstance->appendToList1(&mStructC);
dCsBase_c::sInstance->setField703(false);
d2d::dLytStructDList::GetInstance()->appendToList1(&mStructC);
dCsBase_c::GetInstance()->setField703(false);
return SUCCEEDED;
}
@@ -157,7 +157,7 @@ int dCsGame_c::doDelete() {
mCursor.remove();
mLyt2.dCsGameLytBase_0x14();
mLyt1.dCsGameLytBase_0x14();
d2d::dLytStructDList::sInstance->removeFromList1(&mStructC);
d2d::dLytStructDList::GetInstance()->removeFromList1(&mStructC);
mCursorResAcc.detach();
mMain2DResAcc.detach();
return SUCCEEDED;
src/d/d_room.cpp
+12 -12
View File
@@ -57,19 +57,19 @@ int dRoom_c::create() {
// LMF crawlspace, spike maze
!(dScGame_c::isCurrentStage("D300_1") && (roomid == 7 || roomid == 9));
if (!mAllocator.createNewTempFrmHeap(
-1, CurrentStageArcManager::sInstance->getHeap(roomid), "dRoom_c::m_allocator", 0x20, 0
-1, CurrentStageArcManager::GetInstance()->getHeap(roomid), "dRoom_c::m_allocator", 0x20, 0
)) {
return FAILED;
}
bool anyError = false;
mRoomRes = nw4r::g3d::ResFile(CurrentStageArcManager::sInstance->loadFromRoomArc(roomid, "g3d/room.brres"));
mRoomRes = nw4r::g3d::ResFile(CurrentStageArcManager::GetInstance()->loadFromRoomArc(roomid, "g3d/room.brres"));
dStage_c::bindStageResToFile(&mRoomRes);
dStage_c::bindSkyCmnToResFile(&mRoomRes);
for (s32 i = 0; i < ROOM_NUM_MODELS; i++) {
model_c *mdl = &mModels[i];
model_c *mdl = mModels;
for (s32 i = 0; i < ROOM_NUM_MODELS; i++, mdl++) {
if (i != 2 || roomid != 1 || dScGame_c::currentSpawnInfo.layer != 14 || !dScGame_c::isCurrentStage("F406")) {
if (!mdl->create(mRoomRes, mAllocator, i, &mWaterThing)) {
anyError = true;
@@ -99,7 +99,7 @@ int dRoom_c::create() {
}
dStage_c::GetInstance()->setRoom(roomid, this);
BZS = CurrentStageArcManager::sInstance->loadFromRoomArc(roomid, "dat/room.bzs");
BZS = CurrentStageArcManager::GetInstance()->loadFromRoomArc(roomid, "dat/room.bzs");
parseRoomBzs(roomid, BZS);
mDidAlreadyInit = (params >> 6) & 1;
mStateMgr.changeState(StateID_Active);
@@ -130,9 +130,9 @@ int dRoom_c::execute() {
mStateMgr.executeState();
f32 val = 0.0f;
if (mCanHavePastState) {
val = dTimeAreaMgr_c::sInstance->checkPositionIsInPastState(roomid, mVec3_c::Zero, nullptr, 1000000.0f);
mSkipDrawing = !mHasAnmTexPat && (!dTimeAreaMgr_c::sInstance->isInLanayruMiningFacility() || val > 0.0f) &&
dTimeAreaMgr_c::sInstance->isField0x78();
val = dTimeAreaMgr_c::GetInstance()->checkPositionIsInPastState(roomid, mVec3_c::Zero, nullptr, 1000000.0f);
mSkipDrawing = !mHasAnmTexPat && (!dTimeAreaMgr_c::GetInstance()->isInLanayruMiningFacility() || val > 0.0f) &&
dTimeAreaMgr_c::GetInstance()->isField0x78();
} else {
mSkipDrawing = false;
}
@@ -242,9 +242,9 @@ static const BgData sRoomBg[] = {
bool dRoom_c::setupBg() {
for (int i = 0; i < ROOM_NUM_BG; i++) {
dBgWKCol *bg = &mBg[i];
void *kcl = CurrentStageArcManager::sInstance->getDataFromRoomArc(roomid, sRoomBg[i].kcl);
void *kcl = CurrentStageArcManager::GetInstance()->getDataFromRoomArc(roomid, sRoomBg[i].kcl);
if (kcl != nullptr) {
void *plc = CurrentStageArcManager::sInstance->loadFromRoomArc(roomid, sRoomBg[i].plc);
void *plc = CurrentStageArcManager::GetInstance()->loadFromRoomArc(roomid, sRoomBg[i].plc);
bg->Set(kcl, plc);
bg->SetRoomId(roomid);
bg->SetPriority(dBgW_Base::PRIORITY_0);
@@ -644,9 +644,9 @@ void dRoom_c::model_c::updateObjNode(const char *node, bool visible) {
nd.SetVisibility(visible);
mMdl.somethingVisibility(nd.GetID(), visible);
if (visible) {
dTimeAreaMgr_c::sInstance->setField0x7A(true);
dTimeAreaMgr_c::GetInstance()->setField0x7A(true);
} else {
dTimeAreaMgr_c::sInstance->setField0x7A(false);
dTimeAreaMgr_c::GetInstance()->setField0x7A(false);
}
}
src/d/d_sc_game.cpp
+4 -4
View File
@@ -116,11 +116,11 @@ sFPhaseBase::sFPhaseState dScGame_c::cb2() {
return sFPhaseBase::PHASE_RETRY;
}
if (OarcManager::sInstance->ensureAllEntriesLoaded()) {
if (OarcManager::GetInstance()->ensureAllEntriesLoaded()) {
return sFPhaseBase::PHASE_RETRY;
}
if (LayoutArcManager::sInstance->ensureAllEntriesLoaded()) {
if (LayoutArcManager::GetInstance()->ensureAllEntriesLoaded()) {
return sFPhaseBase::PHASE_RETRY;
}
@@ -182,14 +182,14 @@ void dScGame_c::setRespawnInfo(const mVec3_c &linkPos, const mAng3_c &linkRot, b
if (mPreventSaveRespawnInfo != true && !isInThunderDragonTrial && !isInHordeFight &&
(areaType != 2 && !isCurrentStage("B100_1") && !sPreventClearingSomeFlag &&
(areaType != 1 || (mLastAreaType != 1 && mLastAreaType != 2)))) {
FileManager::sInstance->setT3Info(linkPos, linkRot);
FileManager::GetInstance()->setT3Info(linkPos, linkRot);
if (mLastAreaType != 5 && unk) {
StoryflagManager::sInstance->unsetFlag(752);
}
}
if (!isInThunderDragonTrial && isCurrentStage("B400") && mLastAreaType != 2) {
FileManager::sInstance->copyCurrentToFileB();
FileManager::GetInstance()->copyCurrentToFileB();
}
sPreventClearingSomeFlag = 0;
mPreventSaveRespawnInfo = false;
src/d/d_sc_title.cpp
+10 -10
View File
@@ -52,8 +52,8 @@ dScTitle_c::dScTitle_c() {
} else {
actuallyTriggerEntrance("F000", 0, 28, 48, 0, 0, 0, 15, -1);
}
FileManager::sInstance->clearTempFileData();
FileManager::sInstance->initFile(1);
FileManager::GetInstance()->clearTempFileData();
FileManager::GetInstance()->initFile(1);
fn_80052D50(lbl_805750D8);
lbl_80575787 = 0;
field_0x2AC = 0;
@@ -94,8 +94,8 @@ int dScTitle_c::create() {
fn_80058C90(0);
fn_80015E40();
field_0x2AD = 0;
LayoutArcManager::sInstance->loadLayoutArcFromDisk(sFileSelect, nullptr);
LayoutArcManager::sInstance->loadLayoutArcFromDisk(sSkb, nullptr);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk(sFileSelect, nullptr);
LayoutArcManager::GetInstance()->loadLayoutArcFromDisk(sSkb, nullptr);
mDvd_toMainRam_normal_c::create2(&mpSkbArc, "/SKB/sofkeybd.arc", 0, dHeap::work2Heap.heap);
SizedString<128> fntPath;
fntPath.sprintf("/US/Font/%s/%s", getUsedLanguageString(), "normal_02.brfnt");
@@ -117,20 +117,20 @@ extern "C" void fn_80015E80();
int dScTitle_c::doDelete() {
// TODO return codes
int result;
result = LayoutArcManager::sInstance->ensureLoaded2(sFileSelect);
result = LayoutArcManager::GetInstance()->ensureLoaded2(sFileSelect);
if (result != -2) {
if (result != 0) {
return NOT_READY;
}
LayoutArcManager::sInstance->decrement(sFileSelect);
LayoutArcManager::GetInstance()->decrement(sFileSelect);
}
result = LayoutArcManager::sInstance->ensureLoaded2(sSkb);
result = LayoutArcManager::GetInstance()->ensureLoaded2(sSkb);
if (result != -2) {
if (result != 0) {
return NOT_READY;
}
LayoutArcManager::sInstance->decrement(sSkb);
LayoutArcManager::GetInstance()->decrement(sSkb);
}
// TODO here's the other half of the ::destroy fakematch...
@@ -158,7 +158,7 @@ int dScTitle_c::draw() {
extern "C" u32 TITLE_SCREEN_CHANGE;
void dScTitle_c::loadTitleScreen(u32 params) {
FileManager::sInstance->updateEmptyFiles();
FileManager::GetInstance()->updateEmptyFiles();
if (checkAllSaveFilesEmpty() == true && params != 1) {
params = 2;
}
@@ -203,7 +203,7 @@ void dScTitle_c::finalizeState_Action() {
}
bool dScTitle_c::checkAllSaveFilesEmpty() {
FileManager *mgr = FileManager::sInstance;
FileManager *mgr = FileManager::GetInstance();
bool allEmpty = true;
for (int i = 0; i < 3; i++) {
if (!mgr->isFileEmpty(i)) {
src/d/d_stage.cpp
+6 -6
View File
@@ -136,7 +136,7 @@ sFPhaseBase::sFPhaseState dStage_c::createRooms() {
dBase_c::createBase(fProfile::TITLE, this, 0, OTHER);
}
dTimeAreaMgr_c::sInstance->setField0x78(false);
dTimeAreaMgr_c::GetInstance()->setField0x78(false);
return sFPhaseBase::PHASE_NEXT;
}
@@ -218,7 +218,7 @@ void dStage_c::setRoomVisited(int roomid) {
return;
}
if (dScGame_c::sInstance == nullptr || dScGame_c::sInstance->profile_name == fProfile::GAME) {
if (dScGame_c::sInstance == nullptr || dScGame_c::GetInstance()->profile_name == fProfile::GAME) {
u16 flag, shift;
getFlagPositionForRoomVisit(roomid, &flag, &shift);
DungeonflagManager *mg = DungeonflagManager::sInstance;
@@ -235,7 +235,7 @@ dRoom_c *dStage_c::createRoom(int roomid, bool flag0x40) {
void dStage_c::createLytSeekerStone() {
dBase_c::createBase(fProfile::LYT_CONTROL_GAME, this, 0, OTHER);
if (LayoutArcManager::sInstance->hasEntry("SeekerStone")) {
if (LayoutArcManager::GetInstance()->hasEntry("SeekerStone")) {
dBase_c::createBase(fProfile::LYT_SEEKER_STONE, this, 0, OTHER);
}
}
@@ -248,14 +248,14 @@ dBase_c *dStage_c::getParentForRoom(s32 idx) {
}
void dStage_c::bindStageResToFile(nw4r::g3d::ResFile *file) {
nw4r::g3d::ResFile f = nw4r::g3d::ResFile(CurrentStageArcManager::sInstance->getData("g3d/stage.brres"));
nw4r::g3d::ResFile f = nw4r::g3d::ResFile(CurrentStageArcManager::GetInstance()->getData("g3d/stage.brres"));
if (f.IsValid()) {
file->Bind(f);
}
}
void dStage_c::bindSkyCmnToResFile(nw4r::g3d::ResFile *file) {
nw4r::g3d::ResFile f = nw4r::g3d::ResFile(OarcManager::sInstance->getSubEntryData("SkyCmn", "g3d/model.brres"));
nw4r::g3d::ResFile f = nw4r::g3d::ResFile(OarcManager::GetInstance()->getSubEntryData("SkyCmn", "g3d/model.brres"));
if (f.IsValid()) {
file->Bind(f);
}
@@ -271,7 +271,7 @@ bool dStage_c::getMA0AnmTexSrt(nw4r::g3d::ResAnmTexSrt *o_srt, const char *matNa
const char **candidate = sMatsToTry;
for (int i = 0; i < ARRAY_LENGTH(sMatsToTry); i++, candidate++) {
if (!std::strncmp(matName, *candidate, std::strlen(*candidate))) {
nw4r::g3d::ResFile mdl = nw4r::g3d::ResFile(OarcManager::sInstance->getMdlFromArc2("Common"));
nw4r::g3d::ResFile mdl = nw4r::g3d::ResFile(OarcManager::GetInstance()->getMdlFromArc2("Common"));
*o_srt = mdl.GetResAnmTexSrt(*candidate);
return true;
}
src/d/d_stage_mgr.cpp
+17 -17
View File
@@ -41,17 +41,17 @@ dStageMgr_c::~dStageMgr_c() {
}
void dStageMgr_c::initializeState_ReadStageRes() {
CurrentStageArcManager::sInstance->setStage(dScGame_c::currentSpawnInfo.stageName);
CurrentStageArcManager::GetInstance()->setStage(dScGame_c::currentSpawnInfo.stageName);
}
void dStageMgr_c::executeState_ReadStageRes() {
if (CurrentStageArcManager::sInstance->ensureAllEntriesLoaded() == 0) {
if (CurrentStageArcManager::GetInstance()->ensureAllEntriesLoaded() == 0) {
mStateMgr.changeState(StateID_ReadRoomRes);
}
}
void dStageMgr_c::finalizeState_ReadStageRes() {
const void *stageBzs = CurrentStageArcManager::sInstance->getData("dat/stage.bzs");
const void *stageBzs = CurrentStageArcManager::GetInstance()->getData("dat/stage.bzs");
if (stageBzs != nullptr) {
parseStageBzs(-1, stageBzs);
parseRoomStageBzs(-1, stageBzs);
@@ -62,8 +62,8 @@ void dStageMgr_c::finalizeState_ReadStageRes() {
void dStageMgr_c::initializeState_ReadRoomRes() {}
void dStageMgr_c::executeState_ReadRoomRes() {
if (CurrentStageArcManager::sInstance->ensureAllEntriesLoaded() == 0 &&
LayoutArcManager::sInstance->ensureAllEntriesLoaded() == 0) {
if (CurrentStageArcManager::GetInstance()->ensureAllEntriesLoaded() == 0 &&
LayoutArcManager::GetInstance()->ensureAllEntriesLoaded() == 0) {
mStateMgr.changeState(StateID_ReadObjectRes);
}
}
@@ -72,13 +72,13 @@ void dStageMgr_c::finalizeState_ReadRoomRes() {
if (mpRmpl != nullptr) {
const RMPL *itRmpl = mpRmpl;
for (int i = 0; i < mRmplCount; itRmpl++, i++) {
const void *bzs = CurrentStageArcManager::sInstance->loadFromRoomArc(itRmpl->roomId, "dat/room.bzs");
const void *bzs = CurrentStageArcManager::GetInstance()->loadFromRoomArc(itRmpl->roomId, "dat/room.bzs");
parseRoomStageBzs(itRmpl->roomId, bzs);
}
} else {
u32 roomId = dScGame_c::currentSpawnInfo.room;
const void *bzs =
CurrentStageArcManager::sInstance->loadFromRoomArc(dScGame_c::currentSpawnInfo.room, "dat/room.bzs");
CurrentStageArcManager::GetInstance()->loadFromRoomArc(dScGame_c::currentSpawnInfo.room, "dat/room.bzs");
parseRoomStageBzs(roomId, bzs);
}
}
@@ -96,11 +96,11 @@ void dStageMgr_c::executeState_ReadObjectRes() {
void dStageMgr_c::finalizeState_ReadObjectRes() {}
void dStageMgr_c::initializeState_ReadStageLayerRes() {
CurrentStageArcManager::sInstance->loadFileFromExtraLayerArc(dScGame_c::currentSpawnInfo.layer);
CurrentStageArcManager::GetInstance()->loadFileFromExtraLayerArc(dScGame_c::currentSpawnInfo.layer);
}
void dStageMgr_c::executeState_ReadStageLayerRes() {
if (CurrentStageArcManager::sInstance->ensureAllEntriesLoaded() == 0) {
if (CurrentStageArcManager::GetInstance()->ensureAllEntriesLoaded() == 0) {
mStateMgr.changeState(StateID_ReadLayerObjectRes);
}
}
@@ -115,7 +115,7 @@ static const char *sSeekerStoneLayoutArcs[] = {
void dStageMgr_c::initializeState_ReadLayerObjectRes() {
mDemoName = demoName;
const void *bzs = CurrentStageArcManager::sInstance->getData("dat/stage.bzs");
const void *bzs = CurrentStageArcManager::GetInstance()->getData("dat/stage.bzs");
if (bzs != nullptr) {
parseBzsStageRoom(-1, bzs);
}
@@ -123,13 +123,13 @@ void dStageMgr_c::initializeState_ReadLayerObjectRes() {
if (mpRmpl != nullptr) {
const RMPL *itRmpl = mpRmpl;
for (int i = 0; i < mRmplCount; itRmpl++, i++) {
const void *bzs = CurrentStageArcManager::sInstance->loadFromRoomArc(itRmpl->roomId, "dat/room.bzs");
const void *bzs = CurrentStageArcManager::GetInstance()->loadFromRoomArc(itRmpl->roomId, "dat/room.bzs");
parseBzsStageRoom(itRmpl->roomId, bzs);
}
} else {
u32 roomId = dScGame_c::currentSpawnInfo.room;
const void *bzs =
CurrentStageArcManager::sInstance->loadFromRoomArc(dScGame_c::currentSpawnInfo.room, "dat/room.bzs");
CurrentStageArcManager::GetInstance()->loadFromRoomArc(dScGame_c::currentSpawnInfo.room, "dat/room.bzs");
parseBzsStageRoom(roomId, bzs);
}
@@ -142,7 +142,7 @@ void dStageMgr_c::initializeState_ReadLayerObjectRes() {
}
void dStageMgr_c::executeState_ReadLayerObjectRes() {
if (mLayerObjCtrl.isLoaded() && LayoutArcManager::sInstance->ensureAllEntriesLoaded() == 0) {
if (mLayerObjCtrl.isLoaded() && LayoutArcManager::GetInstance()->ensureAllEntriesLoaded() == 0) {
mStateMgr.changeState(StateID_SoundLoadSceneData);
}
}
@@ -153,9 +153,9 @@ extern "C" void *FOR_LOADED_PARTICLES;
void dStageMgr_c::finalizeState_ReadLayerObjectRes() {
if (mDemoName.len() != 0) {
const char *name = mDemoName;
void *jpc = OarcManager::sInstance->getSubEntryData(name, "dat/jparticle.jpc");
void *jpc = OarcManager::GetInstance()->getSubEntryData(name, "dat/jparticle.jpc");
if (jpc != nullptr) {
void *jpn = OarcManager::sInstance->getSubEntryData(name, "dat/jparticle.jpn");
void *jpn = OarcManager::GetInstance()->getSubEntryData(name, "dat/jparticle.jpn");
fn_800C85D0(FOR_LOADED_PARTICLES, dHeap::work2Heap.heap, true, jpc, jpn);
}
}
@@ -213,7 +213,7 @@ void dStageMgr_c::executeState_ReadObjectSound() {
}
if (dScGame_c::sInstance != nullptr) {
if (dScGame_c::sInstance->savePromptFlag() == true) {
if (dScGame_c::GetInstance()->savePromptFlag() == true) {
mStateMgr.changeState(StateID_SceneChangeSave);
} else {
mStateMgr.changeState(StateID_RestartSceneWait);
@@ -235,7 +235,7 @@ void dStageMgr_c::finalizeState_ReadObjectSound() {
extern "C" void *LYT_SAVE_MGR;
extern "C" void fn_80285600(void *, int, int);
void dStageMgr_c::initializeState_SceneChangeSave() {
dScGame_c::sInstance->setSavePromptFlag(false);
dScGame_c::GetInstance()->setSavePromptFlag(false);
if (LYT_SAVE_MGR != nullptr) {
fn_80285600(LYT_SAVE_MGR, 3, 0);
}
src/d/d_stage_parse.cpp
+5 -5
View File
@@ -56,7 +56,7 @@ static void handleBzsStif(int roomid, const BzsSectionHead *section) {
// section->mCount == 1
dStageMgr_c::GetInstance()->setStif(OFS_TO_PTR(STIF, section));
s16 flagIndex = dStageMgr_c::GetInstance()->getFlagIndex();
FileManager::sInstance->setSceneFlagIndex(flagIndex);
FileManager::GetInstance()->setSceneFlagIndex(flagIndex);
updateFlagForFlagIndex(flagIndex);
}
@@ -163,15 +163,15 @@ static void handleBzsPly(int roomid, const BzsSectionHead *section) {
bool preventSetRespawnInfo = false;
u8 reloaderType = dScGame_c::getReloaderType();
if (reloaderType != 0) {
FileManager *fileMgr = FileManager::sInstance;
FileManager *fileMgr = FileManager::GetInstance();
if (reloaderType == 2) {
pos = *FileManager::sInstance->getPosT2();
pos = *FileManager::GetInstance()->getPosT2();
ang.y = fileMgr->getAngleT2();
linkPos = &pos;
linkAngle = &ang;
linkActorParams = 0x7FFFF1B;
} else if (reloaderType == 3) {
pos = *FileManager::sInstance->getPosT3();
pos = *FileManager::GetInstance()->getPosT3();
ang.y = fileMgr->getAngleT3();
linkPos = &pos;
linkAngle = &ang;
@@ -183,7 +183,7 @@ static void handleBzsPly(int roomid, const BzsSectionHead *section) {
}
}
} else {
if (FileManager::sInstance->getEntranceLoadFlagT1() == 0 && dScGame_c::getReloaderType() != 4) {
if (FileManager::GetInstance()->getEntranceLoadFlagT1() == 0 && dScGame_c::getReloaderType() != 4) {
pos = *fileMgr->getPosT1();
ang.y = fileMgr->getAngleT1();
if (fileMgr->fn_8000CC00() == 2) {
src/d/d_tag_processor.cpp
+4 -4
View File
@@ -771,16 +771,16 @@ void dTagProcessor_c::fn_800B5520(wchar_t *src) {
}
wchar_t *dTagProcessor_c::writeHeroname(wchar_t *dest, s32 *outArg, s32 arg) {
if (FileManager::sInstance->getHeroname()[0] != '\0') {
for (int i = 0; FileManager::sInstance->getHeroname()[i] != '\0'; i++) {
if (FileManager::GetInstance()->getHeroname()[0] != '\0') {
for (int i = 0; FileManager::GetInstance()->getHeroname()[i] != '\0'; i++) {
if (arg != 0 && field_0x90E != 0) {
wchar_t c = FileManager::sInstance->getHeroname()[i];
wchar_t c = FileManager::GetInstance()->getHeroname()[i];
fn_800B5FD0(c, &field_0x008[field_0x90E - 1][*outArg], outArg);
if (field_0x90E - 1 < 4) {
field_0x808[field_0x90E - 1]++;
}
} else {
dest = fn_800B5FD0(FileManager::sInstance->getHeroname()[i], dest, nullptr);
dest = fn_800B5FD0(FileManager::GetInstance()->getHeroname()[i], dest, nullptr);
}
}
}
src/d/flag/dungeonflag_manager.inc
+1 -1
View File
@@ -65,7 +65,7 @@ bool DungeonflagManager::commit() {
if (idx == 0xFFFF) {
return false;
} else if (mShouldCommit) {
instance = FileManager::sInstance;
instance = FileManager::GetInstance();
u16 *ptr = mFlagSpace.getFlagPtrUnchecked();
instance->setDungeonFlags(ptr, (idx & 0x1fff) * 8, 0x08);
mShouldCommit = false;
src/d/flag/enemyflag_manager.inc
+3 -3
View File
@@ -7,7 +7,7 @@ u16 EnemyflagManager::sEnemyDefeatFlags[4096] = {};
void EnemyflagManager::clearSavedFlags() {
u16 empty[0x1000];
memset(empty, 0, 0x2000);
FileManager::getInstance()->setEnemyDefeatFlags(empty, 0, 0x1000);
FileManager::GetInstance()->setEnemyDefeatFlags(empty, 0, 0x1000);
}
/* 0x800BEB00 */
@@ -33,7 +33,7 @@ void EnemyflagManager::init() {
void EnemyflagManager::copyFromSave(u16 sceneIndex) {
mSceneIndex = sceneIndex;
u16 count = mFlagSpace.mCount;
u16 *flags = FileManager::getInstance()->getEnemyDefeatFlagsConst();
u16 *flags = FileManager::GetInstance()->getEnemyDefeatFlagsConst();
mFlagSpace.copyFromSaveFile(flags, 0, count);
}
@@ -62,7 +62,7 @@ bool EnemyflagManager::checkFlag(u16 flag) {
if (!checkIsValidFlag(flag)) {
return false;
} else {
u16 *pData = FileManager::getInstance()->getEnemyDefeatFlagsConst();
u16 *pData = FileManager::GetInstance()->getEnemyDefeatFlagsConst();
return mFlagHelper.checkFlag(flag / 16, flag % 16, pData, getFlagCount());
}
}
src/d/flag/flag_managers.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ static void postSetup() {
}
void copyAllFlagManagersFromSave() {
u16 flag = FileManager::sInstance->getSceneFlagIndex();
u16 flag = FileManager::GetInstance()->getSceneFlagIndex();
SceneflagManager::sInstance->copyFromSave(flag);
TBoxflagManager::sInstance->copyFromSave(flag);
StoryflagManager::sInstance->copyFromSave();
src/d/flag/flag_space.inc
+1 -1
View File
@@ -26,7 +26,7 @@ void FlagSpace::copyFromSaveFile(const u16 *pSaved, u16 offset, u16 flagCount) {
checkedMemcpy(mpFlags + offset, (u16)(mCount * 2), pSaved, (u16)(flagCount * 2));
}
void FlagSpace::filemanagerCheck() const {
if (FileManager::sInstance->mIsFileUnk1[0]) {
if (FileManager::GetInstance()->mIsFileUnk1[0]) {
return;
}
while (true) {}
src/d/flag/sceneflag_manager.inc
+21 -25
View File
@@ -38,7 +38,7 @@ s32 SceneflagManager::isZoneFlag(u32 flag) {
void SceneflagManager::updateFlagindex(u16 sceneIdx) {
if (sceneIdx != mSceneIdx) {
mSceneIdx = sceneIdx;
mSceneflags.copyFromSaveFile2(FileManager::sInstance->getSceneFlagsConst() + sceneIdx * 8, 0, 8);
mSceneflags.copyFromSaveFile2(FileManager::GetInstance()->getSceneFlagsConst() + sceneIdx * 8, 0, 8);
unsetZoneAndTempflags();
}
}
@@ -47,25 +47,25 @@ void SceneflagManager::copyFromSave(u32 sceneIdx) {
u16 sceneIdx2 = sceneIdx;
// missing clrlwi, more inlines?
mSceneIdx = sceneIdx2;
mSceneflags.copyFromSaveFile2(FileManager::getInstance()->getSceneFlagsConst() + sceneIdx2 * 8, 0, 8);
mTempflags.copyFromSaveFile(FileManager::getInstance()->getTempFlagsConst(), 0, mTempflags.mCount);
mZoneflags.copyFromSaveFile(FileManager::getInstance()->getZoneFlagsConst(), 0, mZoneflags.mCount);
mSceneflags.copyFromSaveFile2(FileManager::GetInstance()->getSceneFlagsConst() + sceneIdx2 * 8, 0, 8);
mTempflags.copyFromSaveFile(FileManager::GetInstance()->getTempFlagsConst(), 0, mTempflags.mCount);
mZoneflags.copyFromSaveFile(FileManager::GetInstance()->getZoneFlagsConst(), 0, mZoneflags.mCount);
}
void SceneflagManager::unsetAllTempflags() {
u16 flags[4];
memset(flags, 0, sizeof(flags));
FileManager::sInstance->setTempFlags(flags, 0, 4);
FileManager::GetInstance()->setTempFlags(flags, 0, 4);
}
void SceneflagManager::zoneflagsResetAll() {
u16 flags[0xFC];
memset(flags, 0, sizeof(flags));
FileManager::sInstance->setZoneFlags(flags, 0, 0xFC);
FileManager::GetInstance()->setZoneFlags(flags, 0, 0xFC);
}
void SceneflagManager::zoneflagsResetForRoom(u16 roomId) {
u16 flags[4];
memset(flags, 0, sizeof(flags));
// ? weird mask
FileManager::sInstance->setZoneFlags(flags, (roomId & 0x3FF) * 4, 4);
FileManager::GetInstance()->setZoneFlags(flags, (roomId & 0x3FF) * 4, 4);
}
void SceneflagManager::unsetZoneAndTempflags() {
unsetAllTempflags();
@@ -98,7 +98,7 @@ bool SceneflagManager::checkZoneFlag(u16 roomId, u16 flag) {
return false;
} else {
u16 zoneflag = flag - 0xC0;
u16 *pData = FileManager::sInstance->getZoneFlagsConst();
u16 *pData = FileManager::GetInstance()->getZoneFlagsConst();
u16 slot = getZoneflagSlot(roomId, zoneflag);
return mFlagHelper.checkFlag(slot, zoneflag % 16, pData, 0xFC);
}
@@ -114,11 +114,11 @@ bool SceneflagManager::checkUncommittedZoneflag(u16 roomId, u16 flag) {
return mFlagHelper.checkFlag(slot, zoneflag % 16, pData, mZoneflags.mCount);
}
}
inline bool checkSceneflag(SceneflagManager *mgr, u16 flag) {
inline bool SceneflagManager::checkSceneflagHelper(u16 flag) {
u16 *pData;
pData = mgr->mSceneflags.getFlagPtrUnchecked();
pData = mSceneflags.getFlagPtrUnchecked();
// u16 slot = getSceneflagSlot2(flag);
return mgr->mFlagHelper.checkFlag(mgr->getSceneflagSlot(flag), flag % 16, pData, mgr->mSceneflags.mCount);
return mFlagHelper.checkFlag(getSceneflagSlot(flag), flag % 16, pData, mSceneflags.mCount);
}
bool SceneflagManager::checkUncommittedTempOrSceneflag(u16 flag) {
if (flag >= 0x80) {
@@ -128,11 +128,7 @@ bool SceneflagManager::checkUncommittedTempOrSceneflag(u16 flag) {
u16 slot = getTempflagSlot(tempflag);
return mFlagHelper.checkFlag(slot, tempflag % 16, pData, mTempflags.mCount);
} else {
return ::checkSceneflag(this, flag);
// u16* pData;
// pData = mSceneflags.getFlagPtr();
// // u16 slot = getSceneflagSlot2(flag);
// mFlagHelper.checkFlag(getSceneflagSlot2(flag), flag % 16, pData, mSceneflags.mCount);
return checkSceneflagHelper(flag);
}
}
u16 SceneflagManager::checkFlag(u16 roomId, u16 flag) {
@@ -143,13 +139,13 @@ u16 SceneflagManager::checkFlag(u16 roomId, u16 flag) {
}
}
bool SceneflagManager::checkSceneflagGlobal(u16 sceneIdx, u16 flag) {
u16 *pData = FileManager::sInstance->getSceneFlagsConst();
u16 *pData = FileManager::GetInstance()->getSceneFlagsConst();
return mFlagHelper.checkFlag(getSceneflagSlotGlobal(sceneIdx, flag), flag % 16, pData, 0x800);
}
u16 SceneflagManager::checkTempOrSceneflag(u16 flag) {
if (flag >= 0x80) {
u16 tempflag = flag - 0x80;
const u16 *pData = FileManager::sInstance->getTempFlagsConst();
const u16 *pData = FileManager::GetInstance()->getTempFlagsConst();
u16 slot = getTempflagSlot(tempflag);
return mFlagHelper.checkFlag(slot, tempflag % 16, pData, 4);
} else {
@@ -182,10 +178,10 @@ void SceneflagManager::setFlag(u16 roomId, u16 flag) {
}
void SceneflagManager::setSceneflagGlobal(u16 sceneIdx, u16 flag) {
u16 slot = getSceneflagSlotGlobal(sceneIdx, flag);
u16 *pData = FileManager::sInstance->getSceneFlagsConst();
u16 *pData = FileManager::GetInstance()->getSceneFlagsConst();
u16 pCurData = pData[slot];
mFlagHelper.setFlag(0, flag % 16, &pCurData, 2);
FileManager::sInstance->setSceneFlags(&pCurData, slot, 1);
FileManager::GetInstance()->setSceneFlags(&pCurData, slot, 1);
if (sceneIdx == mSceneIdx) {
u16 *pData2 = mSceneflags.getFlagPtrChecked();
mFlagHelper.setFlag(getSceneflagSlot(flag), flag % 16, pData2, mSceneflags.mCount);
@@ -225,10 +221,10 @@ void SceneflagManager::unsetFlag(u16 roomId, u16 flag) {
}
void SceneflagManager::unsetSceneflagGlobal(u16 sceneIdx, u16 flag) {
u16 slot = getSceneflagSlotGlobal(sceneIdx, flag);
u16 *pData = FileManager::sInstance->getSceneFlagsConst();
u16 *pData = FileManager::GetInstance()->getSceneFlagsConst();
u16 pCurData = pData[slot];
mFlagHelper.unsetFlag(0, flag % 16, &pCurData, 2);
FileManager::sInstance->setSceneFlags(&pCurData, slot, 1);
FileManager::GetInstance()->setSceneFlags(&pCurData, slot, 1);
if (sceneIdx == mSceneIdx) {
u16 *pData2 = mSceneflags.getFlagPtrChecked();
mFlagHelper.unsetFlag(getSceneflagSlot(flag), flag % 16, pData2, mSceneflags.mCount);
@@ -253,9 +249,9 @@ s32 SceneflagManager::commit() {
if (mSceneIdx == 0xFFFF) {
return 0;
} else if (mShouldCommit) {
FileManager::getInstance()->setSceneFlags(mSceneflags.getFlagPtrUnchecked(), mSceneIdx * 8, 8);
FileManager::getInstance()->setTempFlags(mTempflags.getFlagPtrUnchecked(), 0, mTempflags.mCount);
FileManager::getInstance()->setZoneFlags(mZoneflags.getFlagPtrUnchecked(), 0, mZoneflags.mCount);
FileManager::GetInstance()->setSceneFlags(mSceneflags.getFlagPtrUnchecked(), mSceneIdx * 8, 8);
FileManager::GetInstance()->setTempFlags(mTempflags.getFlagPtrUnchecked(), 0, mTempflags.mCount);
FileManager::GetInstance()->setZoneFlags(mZoneflags.getFlagPtrUnchecked(), 0, mZoneflags.mCount);
mShouldCommit = false;
return 1;
}
src/d/flag/skipflag_manager.inc
+5 -5
View File
@@ -12,7 +12,7 @@ u16 SkipflagManager::sSkipFlags[16] = {};
// 800bfba0
void SkipflagManager::doCopyFromSave() {
u16 *savedSkipflags = FileManager::sInstance->getSkipFlags();
u16 *savedSkipflags = FileManager::GetInstance()->getSkipFlags();
mFlagSpace.copyFromSaveFile(savedSkipflags, 0, 0x10);
}
@@ -39,23 +39,23 @@ void SkipflagManager::setFlag(u16 flag) {
mFlagHelper.setFlag(flag / 16, flag % 16, mFlagSpace.getFlagPtrChecked(), mFlagSpace.mCount);
u16 savedSkipflags[0x10];
checkedMemcpy(savedSkipflags, 0x20, FileManager::sInstance->getSkipFlags(), 0x20);
checkedMemcpy(savedSkipflags, 0x20, FileManager::GetInstance()->getSkipFlags(), 0x20);
mFlagHelper.setFlag(flag / 16, flag % 16, savedSkipflags, 0x10);
FileManager::sInstance->setSkipFlagsChecked(savedSkipflags, 0, 0x10);
FileManager::GetInstance()->setSkipFlagsChecked(savedSkipflags, 0, 0x10);
setCommitFlag(flag);
}
// 800bfd20
bool SkipflagManager::checkFlag(u16 flag) {
u16 *savedSkipflags = FileManager::sInstance->getSkipFlags();
u16 *savedSkipflags = FileManager::GetInstance()->getSkipFlags();
return mFlagHelper.checkFlag(flag / 16, flag % 16, savedSkipflags, 0x10);
}
// 800bfd90
bool SkipflagManager::commit() {
if (mShouldCommit) {
FileManager *instance = FileManager::sInstance;
FileManager *instance = FileManager::GetInstance();
instance->setSkipFlagsChecked(mFlagSpace.getFlagPtrUnchecked(), 0, 0x10);
mShouldCommit = false;
return true;
src/d/flag/tboxflag_manager.inc
+3 -3
View File
@@ -7,7 +7,7 @@ u16 TBoxflagManager::sTBoxFlags[2] = {};
/* 0x800BE810 */
void TBoxflagManager::doCommit() {
if (mSceneIndex != 0xFFFF) {
FileManager::getInstance()->setTBoxFlags(mFlagSpace.getFlagPtrUnchecked(), mSceneIndex * 2, 2);
FileManager::GetInstance()->setTBoxFlags(mFlagSpace.getFlagPtrUnchecked(), mSceneIndex * 2, 2);
}
}
@@ -28,7 +28,7 @@ void TBoxflagManager::init() {}
void TBoxflagManager::copyFromSave(u32 sceneIndex) {
u16 idx = sceneIndex;
mSceneIndex = idx;
u16 *flags = FileManager::getInstance()->getTBoxFlagsConst();
u16 *flags = FileManager::GetInstance()->getTBoxFlagsConst();
mFlagSpace.copyFromSaveFile2(flags + (idx * 2), 0, 2);
}
@@ -36,7 +36,7 @@ void TBoxflagManager::copyFromSave(u32 sceneIndex) {
u16 TBoxflagManager::checkFlag(u16 sceneIndex, u16 flag) {
s32 actualFlag = (flag + sceneIndex * 0x20);
return mFlagHelper.checkFlag(
actualFlag / 16, flag % 16, FileManager::getInstance()->getTBoxFlagsConst(), getFlagCount()
actualFlag / 16, flag % 16, FileManager::GetInstance()->getTBoxFlagsConst(), getFlagCount()
);
}
src/d/lyt/d_lyt_area_caption.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ static const char *captionBoxes[] = {
dLytAreaCaption_c *dLytAreaCaption_c::sInstance;
bool dLytAreaCaptionParts_c::init(int first) {
void *data = LayoutArcManager::sInstance->getLoadedData("DoButton");
void *data = LayoutArcManager::GetInstance()->getLoadedData("DoButton");
mResAcc.attach(data, "");
mLyt.setResAcc(&mResAcc);
src/d/lyt/d_lyt_battery.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ bool dLytBattery_c::draw() {
}
bool dLytBattery_c::init() {
void *data = LayoutArcManager::sInstance->getLoadedData("System2D");
void *data = LayoutArcManager::GetInstance()->getLoadedData("System2D");
mResAcc.attach(data, "");
mLyt.setResAcc(&mResAcc);
mLyt.build("denchi_00.brlyt", nullptr);
src/d/lyt/d_lyt_common_arrow.cpp
+4 -4
View File
@@ -38,7 +38,7 @@ static const d2d::LytBrlanMapping brlanMap[] = {
dLytCommonArrow_c::dLytCommonArrow_c() : mStateMgr(*this, sStateID::null) {}
bool dLytCommonArrow_c::init() {
void *data = LayoutArcManager::sInstance->getLoadedData("CommonArrow");
void *data = LayoutArcManager::GetInstance()->getLoadedData("CommonArrow");
mResAcc.attach(data, "");
mLytBase.build("commonArrow_00.brlyt", &mResAcc);
mLytBase.mPriority = 0x86;
@@ -47,7 +47,7 @@ bool dLytCommonArrow_c::init() {
mAnmGroups[i].init(brlanMap[i].mFile, &mResAcc, mLytBase.getLayout(), brlanMap[i].mName);
}
mStructD.fn_80065E70(mLytBase.getLayout()->GetRootPane(), 1, 0, 0);
d2d::dLytStructDList::sInstance->appendToList2(&mStructD);
d2d::dLytStructDList::GetInstance()->appendToList2(&mStructD);
mBoundingL = mLytBase.findBounding("B_arrowL_00");
mBoundingR = mLytBase.findBounding("B_arrowR_00");
mStateMgr.changeState(StateID_None);
@@ -56,7 +56,7 @@ bool dLytCommonArrow_c::init() {
}
bool dLytCommonArrow_c::fn_80168490() {
d2d::dLytStructDList::sInstance->removeFromList2(&mStructD);
d2d::dLytStructDList::GetInstance()->removeFromList2(&mStructD);
mLytBase.unbindAnims();
for (int i = 0; i < 9; i++) {
mAnmGroups[i].afterUnbind();
@@ -150,7 +150,7 @@ void dLytCommonArrow_c::fn_80168880() {
return;
}
d2d::dLytStructD *thing = dCsBase_c::sInstance->getUnk();
d2d::dLytStructD *thing = dCsBase_c::GetInstance()->getUnk();
if (thing != nullptr && thing->getType() == 'lyt ') {
if (thing->field_0x24 == mBoundingL) {
i = 0;
src/d/lyt/d_lyt_fader.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ bool dLytFader_c::init() {
if (field_0x4DD == true) {
return true;
} else {
void *data = LayoutArcManager::sInstance->getLoadedData("System2D");
void *data = LayoutArcManager::GetInstance()->getLoadedData("System2D");
if (!data) {
return false;
}
src/d/lyt/d_lyt_map.cpp
+7 -7
View File
@@ -236,8 +236,8 @@ void dLytMapPinIcon_c::executeState_Remove() {
void dLytMapPinIcon_c::finalizeState_Remove() {}
dLytMapPinIcon_c::~dLytMapPinIcon_c() {
if (d2d::dLytStructDList::sInstance->fn_80065A30(&mStructD)) {
d2d::dLytStructDList::sInstance->removeFromList2(&mStructD);
if (d2d::dLytStructDList::GetInstance()->fn_80065A30(&mStructD)) {
d2d::dLytStructDList::GetInstance()->removeFromList2(&mStructD);
}
}
@@ -267,7 +267,7 @@ bool dLytMapPinIcon_c::build(d2d::ResAccIf_c *resAcc) {
mpBounding = mLyt.findBounding("B_mark_00");
mStructD.fn_80065E70(mpBounding, 2, 1, 0);
d2d::dLytStructDList::sInstance->appendToList2(&mStructD);
d2d::dLytStructDList::GetInstance()->appendToList2(&mStructD);
mAnmGroups[LYT_MAP_PIN_ICON_ANIM_SCALE].setDirection(false);
mAnmGroups[LYT_MAP_PIN_ICON_ANIM_LOOP].setDirection(false);
@@ -282,7 +282,7 @@ bool dLytMapPinIcon_c::build(d2d::ResAccIf_c *resAcc) {
}
bool dLytMapPinIcon_c::remove() {
d2d::dLytStructDList::sInstance->removeFromList2(&mStructD);
d2d::dLytStructDList::GetInstance()->removeFromList2(&mStructD);
for (int i = 0; i < 3; i++) {
mAnmGroups[i].afterUnbind();
}
@@ -398,8 +398,8 @@ void dLytMapFloorBtnMgr_c::finalizeState_Wait() {}
extern "C" void fn_801942F0(int, int);
dLytMapFloorBtnMgr_c::~dLytMapFloorBtnMgr_c() {
for (int i = 0; i < 4; i++) {
if (d2d::dLytStructDList::sInstance->fn_80065A30(&mStructDs[i])) {
d2d::dLytStructDList::sInstance->removeFromList2(&mStructDs[i]);
if (d2d::dLytStructDList::GetInstance()->fn_80065A30(&mStructDs[i])) {
d2d::dLytStructDList::GetInstance()->removeFromList2(&mStructDs[i]);
}
}
fn_801942F0(0, 0);
@@ -488,7 +488,7 @@ void dLytMapMain_c::draw() {}
extern "C" void fn_80016690();
void dLytMap_c::build() {
fn_80016690();
void *data = LayoutArcManager::sInstance->getLoadedData("Map2D");
void *data = LayoutArcManager::GetInstance()->getLoadedData("Map2D");
mResAcc.attach(data, "");
mMapMain.build();
m2d::getAllocator();
src/d/lyt/d_lyt_pause_disp_00.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ void dLytPauseDisp00_c::init() {
}
field_0xE29C.init(mLytBase.getLayout()->GetRootPane(), 1, 0, 0);
d2d::dLytStructDList::sInstance->appendToList2(&field_0xE29C);
d2d::dLytStructDList::GetInstance()->appendToList2(&field_0xE29C);
for (int i = 0; i < 0x25; i++) {
if (i != 0x1F && i != 0x20) {
nw4r::lyt::Bounding *b = mLytBase.findBounding(B_LIST[i]);
src/d/lyt/meter/d_lyt_meter.cpp
+6 -6
View File
@@ -29,7 +29,7 @@ STATE_DEFINE(dLytMeterParts_c, Out);
void dLytMeter1Button_c::initializeState_Wait() {}
void dLytMeter1Button_c::executeState_Wait() {
if (dLytMeterContainer_c::sInstance->isButtonFlag(0x80)) {
if (dLytMeterContainer_c::GetInstance()->isButtonFlag(0x80)) {
return;
}
mStateMgr.changeState(StateID_ToUnuse);
@@ -74,7 +74,7 @@ void dLytMeter1Button_c::initializeState_Unuse() {
field_0x1A4 = 15;
}
void dLytMeter1Button_c::executeState_Unuse() {
if (dLytMeterContainer_c::sInstance->isButtonFlag(0x80)) {
if (dLytMeterContainer_c::GetInstance()->isButtonFlag(0x80)) {
if (!(field_0x1A4 > 0)) {
mStateMgr.changeState(StateID_ToUse);
return;
@@ -140,7 +140,7 @@ bool dLytMeter1Button_c::LytMeter0x14() {
void dLytMeter2Button_c::initializeState_Wait() {}
void dLytMeter2Button_c::executeState_Wait() {
if (dLytMeterContainer_c::sInstance->isButtonFlag(0x100)) {
if (dLytMeterContainer_c::GetInstance()->isButtonFlag(0x100)) {
return;
}
mStateMgr.changeState(StateID_ToUnuse);
@@ -185,7 +185,7 @@ void dLytMeter2Button_c::initializeState_Unuse() {
field_0x1A4 = 15;
}
void dLytMeter2Button_c::executeState_Unuse() {
if (dLytMeterContainer_c::sInstance->isButtonFlag(0x100)) {
if (dLytMeterContainer_c::GetInstance()->isButtonFlag(0x100)) {
if (!(field_0x1A4 > 0)) {
mStateMgr.changeState(StateID_ToUse);
return;
@@ -388,7 +388,7 @@ bool dLytMeter_c::build(d2d::ResAccIf_c *resAcc) {
}
if (isSilentRealm()) {
void *sirenData = LayoutArcManager::sInstance->getLoadedData("Siren");
void *sirenData = LayoutArcManager::GetInstance()->getLoadedData("Siren");
mResAcc.attach(sirenData, "");
mpTimer = new dLytMeterTimer_c();
mpTimerPart1 = new LytMeterTimerPart1_c();
@@ -592,7 +592,7 @@ dLytMeterContainer_c::dLytMeterContainer_c() {
}
bool dLytMeterContainer_c::build() {
void *data = LayoutArcManager::sInstance->getLoadedData("DoButton");
void *data = LayoutArcManager::GetInstance()->getLoadedData("DoButton");
mResAcc.attach(data, "");
if (dScTitle_c::sInstance != nullptr) {
mpEventSkip = nullptr;
src/d/lyt/meter/d_lyt_meter_drink.cpp
+17 -17
View File
@@ -133,26 +133,26 @@ void dLytMeterDrinkParts_c::execute() {
dLytMeterDrinkParts_c::DrinkFrame_e dLytMeterDrinkParts_c::getDrinkFrame(dLytMeterDrinkParts_c::DrinkType_e type
) const {
if (type == TYPE_STAMINA) {
if (FileManager::sInstance->getStaminaPotionPlusTimer()) {
if (FileManager::GetInstance()->getStaminaPotionPlusTimer()) {
return FRAME_STAMINA_PLUS;
}
if (FileManager::sInstance->getStaminaPotionTimer()) {
if (FileManager::GetInstance()->getStaminaPotionTimer()) {
return FRAME_STAMINA;
}
}
if (type == TYPE_AIR) {
if (FileManager::sInstance->getAirPotionPlusTimer()) {
if (FileManager::GetInstance()->getAirPotionPlusTimer()) {
return FRAME_AIR_PLUS;
}
if (FileManager::sInstance->getAirPotionTimer()) {
if (FileManager::GetInstance()->getAirPotionTimer()) {
return FRAME_AIR;
}
}
if (type == TYPE_GUARDIAN) {
if (FileManager::sInstance->getGuardianPotionPlusTimer()) {
if (FileManager::GetInstance()->getGuardianPotionPlusTimer()) {
return FRAME_GUARDIAN_PLUS;
}
if (FileManager::sInstance->getGuardianPotionTimer()) {
if (FileManager::GetInstance()->getGuardianPotionTimer()) {
return FRAME_GUARDIAN;
}
}
@@ -161,17 +161,17 @@ dLytMeterDrinkParts_c::DrinkFrame_e dLytMeterDrinkParts_c::getDrinkFrame(dLytMet
bool dLytMeterDrinkParts_c::isDrinkAboutToExpire() const {
if (field_0x48 == FRAME_STAMINA_PLUS) {
return FileManager::sInstance->getStaminaPotionPlusTimer() < 600;
return FileManager::GetInstance()->getStaminaPotionPlusTimer() < 600;
} else if (field_0x48 == FRAME_STAMINA) {
return FileManager::sInstance->getStaminaPotionTimer() < 600;
return FileManager::GetInstance()->getStaminaPotionTimer() < 600;
} else if (field_0x48 == FRAME_AIR_PLUS) {
return FileManager::sInstance->getAirPotionPlusTimer() < 600;
return FileManager::GetInstance()->getAirPotionPlusTimer() < 600;
} else if (field_0x48 == FRAME_AIR) {
return FileManager::sInstance->getAirPotionTimer() < 600;
return FileManager::GetInstance()->getAirPotionTimer() < 600;
} else if (field_0x48 == FRAME_GUARDIAN_PLUS) {
return FileManager::sInstance->getGuardianPotionPlusTimer() < 600;
return FileManager::GetInstance()->getGuardianPotionPlusTimer() < 600;
} else if (field_0x48 == FRAME_GUARDIAN) {
return FileManager::sInstance->getGuardianPotionTimer() < 600;
return FileManager::GetInstance()->getGuardianPotionTimer() < 600;
}
return false;
}
@@ -444,18 +444,18 @@ int dLytMeterDrink_c::getPartForDrinkType(dLytMeterDrinkParts_c::DrinkType_e ty)
}
bool dLytMeterDrink_c::fn_800E5C40(int i) {
if ((i == 0 || i == 3) && (FileManager::sInstance->getStaminaPotionTimer() != 0 ||
FileManager::sInstance->getStaminaPotionPlusTimer() != 0)) {
if ((i == 0 || i == 3) && (FileManager::GetInstance()->getStaminaPotionTimer() != 0 ||
FileManager::GetInstance()->getStaminaPotionPlusTimer() != 0)) {
return true;
}
if ((i == 1 || i == 3) &&
(FileManager::sInstance->getAirPotionTimer() != 0 || FileManager::sInstance->getAirPotionPlusTimer() != 0)) {
(FileManager::GetInstance()->getAirPotionTimer() != 0 || FileManager::GetInstance()->getAirPotionPlusTimer() != 0)) {
return true;
}
if ((i == 2 || i == 3) && (FileManager::sInstance->getGuardianPotionTimer() != 0 ||
FileManager::sInstance->getGuardianPotionPlusTimer() != 0)) {
if ((i == 2 || i == 3) && (FileManager::GetInstance()->getGuardianPotionTimer() != 0 ||
FileManager::GetInstance()->getGuardianPotionPlusTimer() != 0)) {
return true;
}
src/m/m3d/m_shadow.cpp
+5 -5
View File
@@ -410,7 +410,7 @@ void mShadow_c::drawAllShadows() {
void mShadow_c::create(const mShadowCircleConfig *config, nw4r::g3d::ResMdl mdl, EGG::Heap *heap) {
mShadow_c::sInstance = new (heap, 0x04) mShadow_c(heap);
mShadow_c::sInstance->create(
mShadow_c::GetInstance()->create(
config->count, config->unk1, config->unk2, config->texBufferSize, config->drawOpaPriority, mdl, config->heapSize
);
}
@@ -441,7 +441,7 @@ void mShadow_c::swapHeaps() {
void mShadow_c::destroy() {
if (mShadow_c::sInstance != nullptr) {
mShadow_c::sInstance->remove();
mShadow_c::GetInstance()->remove();
delete mShadow_c::sInstance;
mShadow_c::sInstance = nullptr;
}
@@ -538,7 +538,7 @@ void mShadowChild_c::drawMdl() {
g3d::ScnMdlSimple *mdl = g3d::G3dObj::DynamicCast<g3d::ScnMdlSimple>(lf->getG3dObject());
u32 bufSize = mdl->GetNumViewMtx() * sizeof(math::MTX34);
math::MTX34 *viewPosArray = static_cast<math::MTX34 *>(mShadow_c::sInstance->mpHeap->alloc(bufSize, 0x20));
math::MTX34 *viewPosArray = static_cast<math::MTX34 *>(mShadow_c::GetInstance()->mpHeap->alloc(bufSize, 0x20));
g3d::CalcView(
viewPosArray, nullptr, mdl->GetWldMtxArray(), mdl->GetWldMtxAttribArray(), mdl->GetNumViewMtx(),
@@ -578,12 +578,12 @@ void mShadowChild_c::draw() {
C_MTXLightOrtho(mtx, field_0x13C, -field_0x13C, -field_0x13C, field_0x13C, 0.5f, -0.5f, 0.5f, 0.5f);
PSMTXConcat(mtx, mFrustum.mView.m, mtx);
GXLoadTexMtxImm(mtx, GX_TEXMTX0, GX_MTX_3x4);
mShadow_c::sInstance->draw(mFrustum.mView, field_0x154);
mShadow_c::GetInstance()->draw(mFrustum.mView, field_0x154);
GXSetTevSwapModeTable(GX_TEV_SWAP0, GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA);
}
mShadowCircle_c::~mShadowCircle_c() {
mShadow_c::sInstance->removeCircle(this);
mShadow_c::GetInstance()->removeCircle(this);
}
mCustomShadow_c::~mCustomShadow_c() {}
src/toBeSorted/arc_callback_handler.cpp
+5 -5
View File
@@ -18,7 +18,7 @@ ArcCallbackHandler ArcCallbackHandler::sInstance;
extern "C" void FUN_804a7260(nw4r::g3d::ResMdl, const char *prefix);
void BindSystemModelsAndLighting(nw4r::g3d::ResFile file) {
nw4r::g3d::ResFile sysFile(OarcManager::sInstance->getMdlFromArc2("System"));
nw4r::g3d::ResFile sysFile(OarcManager::GetInstance()->getMdlFromArc2("System"));
if (sysFile.IsValid()) {
file.Bind(sysFile);
}
@@ -62,14 +62,14 @@ void ArcCallbackHandlerBase::CreateArcEntry(void *data, const char *path) {
char buf[64];
sscanf(oarcPath, "/oarc/%31[^.]arc", buf);
u32 oldPrefix = mPrefix;
OarcManager::sInstance->addEntryFromSuperArc(buf, data, nullptr);
OarcManager::GetInstance()->addEntryFromSuperArc(buf, data, nullptr);
mPrefix = oldPrefix;
} else if (mPrefix == NAME_RARC) {
SizedString<64> oarcPath = path;
char buf[64];
sscanf(oarcPath, "/rarc/%31[^.]arc", buf);
u32 oldPrefix = mPrefix;
CurrentStageArcManager::sInstance->addEntryFromSuperArc(buf, data);
CurrentStageArcManager::GetInstance()->addEntryFromSuperArc(buf, data);
mPrefix = oldPrefix;
}
}
@@ -80,14 +80,14 @@ void ArcCallbackHandlerBase::DestroyArcEntry(const char *path) {
char buf[64];
sscanf(oarcPath, "/oarc/%31[^.]arc", buf);
u32 oldPrefix = mPrefix;
OarcManager::sInstance->decrement(buf);
OarcManager::GetInstance()->decrement(buf);
mPrefix = oldPrefix;
} else if (mPrefix == NAME_RARC) {
SizedString<64> oarcPath = path;
char buf[64];
sscanf(oarcPath, "/rarc/%31[^.]arc", buf);
u32 oldPrefix = mPrefix;
CurrentStageArcManager::sInstance->decrement(buf);
CurrentStageArcManager::GetInstance()->decrement(buf);
mPrefix = oldPrefix;
}
}
src/toBeSorted/arc_managers/current_stage_arc_manager.cpp
+2 -2
View File
@@ -118,9 +118,9 @@ const char *CurrentStageArcManager::getRoomArcDirectory(int room) const {
bool CurrentStageArcManager::create(EGG::Heap *heap) {
new (heap, 0x04) CurrentStageArcManager();
if (CurrentStageArcManager::sInstance == nullptr) {
if (GetInstance() == nullptr) {
return false;
}
CurrentStageArcManager::sInstance->init(heap);
GetInstance()->init(heap);
return true;
}
src/toBeSorted/arc_managers/layout_arc_manager.cpp
+2 -2
View File
@@ -51,9 +51,9 @@ void *LayoutArcManager::getLoadedData(const char *path) {
bool LayoutArcManager::create(EGG::Heap *heap) {
new (heap, 0x04) LayoutArcManager();
if (LayoutArcManager::sInstance == nullptr) {
if (GetInstance() == nullptr) {
return false;
}
LayoutArcManager::sInstance->init(heap);
GetInstance()->init(heap);
return true;
}
src/toBeSorted/arc_managers/oarc_manager.cpp
+2 -2
View File
@@ -83,9 +83,9 @@ void *OarcManager::getSubEntryData(const char *oarcName, const char *fileName) {
bool OarcManager::create(EGG::Heap *heap) {
new (heap, 0x04) OarcManager();
if (OarcManager::sInstance == nullptr) {
if (GetInstance() == nullptr) {
return false;
}
OarcManager::sInstance->init(heap);
GetInstance()->init(heap);
return true;
}
src/toBeSorted/attention.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ static const CursorStruct s_Cursors[2] = {
};
bool AttentionManager::createHeap() {
mModels.mResFile = nw4r::g3d::ResFile(OarcManager::sInstance->getMdlFromArc2("UI_Data"));
mModels.mResFile = nw4r::g3d::ResFile(OarcManager::GetInstance()->getMdlFromArc2("UI_Data"));
for (int i = 0; i < 2; i++) {
InteractionMdl *iMdl = &mModels.mMdls[i];
src/toBeSorted/nand_request_thread.cpp
+6 -6
View File
@@ -105,11 +105,11 @@ NandRequestThread *NandRequestThread::create(
}
void *NandRequest::operator new(size_t size) {
return NandRequestThread::sInstance->mpCommandHeap->alloc(size, -4);
return NandRequestThread::GetInstance()->mpCommandHeap->alloc(size, -4);
}
void NandRequest::free(NandRequest *ptr) {
return NandRequestThread::sInstance->mpCommandHeap->free(ptr);
return NandRequestThread::GetInstance()->mpCommandHeap->free(ptr);
}
NANDResult NandRequest::getStatus() const {
@@ -217,7 +217,7 @@ extern "C" NANDResult NANDSimpleSafeClose(NANDFileInfo *info);
bool NandRequestWrite::execute() {
NANDFileInfo info;
mStatus = NANDSimpleSafeOpen(
mFilePath, &info, 2, NandRequestThread::getInstance()->getBuf(), NandRequestThread::getInstance()->getBufSize()
mFilePath, &info, 2, NandRequestThread::GetInstance()->getBuf(), NandRequestThread::GetInstance()->getBufSize()
);
if (mStatus != NAND_RESULT_OK) {
NANDResult res = NANDSimpleSafeCancel(&info);
@@ -278,7 +278,7 @@ bool NandRequestCheckHolder::check(u32 neededBlocks, u32 neededFiles) {
return false;
}
NandRequestCheck *req = NandRequestThread::getInstance()->checkRequest(neededBlocks, neededFiles);
NandRequestCheck *req = NandRequestThread::GetInstance()->checkRequest(neededBlocks, neededFiles);
if (req == nullptr) {
return false;
}
@@ -295,7 +295,7 @@ bool NandRequestCreateHolder::create(const char *filePath, u8 perm, u8 attr) {
return false;
}
NandRequestCreate *req = NandRequestThread::getInstance()->createRequest(filePath, perm, attr);
NandRequestCreate *req = NandRequestThread::GetInstance()->createRequest(filePath, perm, attr);
if (req == nullptr) {
return false;
}
@@ -308,7 +308,7 @@ bool NandRequestWriteHolder::write(const char *filePath, void *data, size_t data
return false;
}
NandRequestWrite *req = NandRequestThread::getInstance()->writeRequest(filePath, data, dataSize);
NandRequestWrite *req = NandRequestThread::GetInstance()->writeRequest(filePath, data, dataSize);
if (req == nullptr) {
return false;
}
src/toBeSorted/time_area_mgr.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ bool dTimeAreaMgr_c::init() {
}
void dTimeAreaMgr_c::draw() {
if (field_0x64 != 0 && dTimeAreaMgr_c::sInstance->field_0x68[0x10] == 0) {
if (field_0x64 != 0 && !dTimeAreaMgr_c::GetInstance()->isField0x78()) {
mProcA.entry();
mProcB.entry();
}