From 8d6e8826d33956a78cd553c5200ce79aeeecc38a Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 2 Jun 2024 00:13:33 +0200 Subject: [PATCH] Headers --- .../arc_managers/current_stage_arc_manager.h | 41 ++++++++++++++++++ .../arc_managers/layout_arc_manager.h | 29 +++++++++++++ .../toBeSorted/arc_managers/oarc_manager.h | 36 ++++++++++++++++ .../current_stage_arc_manager.cpp | 43 ++----------------- .../arc_managers/layout_arc_manager.cpp | 27 +----------- src/toBeSorted/arc_managers/oarc_manager.cpp | 34 +-------------- 6 files changed, 111 insertions(+), 99 deletions(-) create mode 100644 include/toBeSorted/arc_managers/current_stage_arc_manager.h create mode 100644 include/toBeSorted/arc_managers/layout_arc_manager.h create mode 100644 include/toBeSorted/arc_managers/oarc_manager.h diff --git a/include/toBeSorted/arc_managers/current_stage_arc_manager.h b/include/toBeSorted/arc_managers/current_stage_arc_manager.h new file mode 100644 index 00000000..f4f11ce5 --- /dev/null +++ b/include/toBeSorted/arc_managers/current_stage_arc_manager.h @@ -0,0 +1,41 @@ +#ifndef CURRENT_STAGE_ARC_MANAGER_H +#define CURRENT_STAGE_ARC_MANAGER_H + +#include +#include +#include + +class CurrentStageArcManager { + CurrentStageArcManager(); + virtual ~CurrentStageArcManager(); + + SizedString<32> mStageName; + SizedString<32> mCurrentLoadingStageArcName; + SizedString<32> mStageExtraLayerArcName; + + dRawArcTable_c mArcTable; + + static CurrentStageArcManager *sInstance; + + static bool create(EGG::Heap *heap); + + void init(EGG::Heap *heap); + bool setStage(const char *stage); + bool decrement(); + void *getData(const char *fileName); + void *getFileFromCurrentLay0Arc(const char *fileName); + bool loadFileFromExtraLayerArc(int layer); + bool unloadExtraLayerArc(); + bool loadRoomArc(int room); + bool addEntryFromSuperArc(const char *name, void *data); + bool unloadRoomArc(int room); + bool decrement(const char *path); + void *loadFromRoomArc(int roomId, const char *fileName); + void *getDataFromRoomArc(int roomId, const char *fileName); + const char *getCurrentStageDirectory(); + const char *getRoomArcDirectory(int room) const; + + static EGG::ExpHeap *getHeap(); +}; + +#endif diff --git a/include/toBeSorted/arc_managers/layout_arc_manager.h b/include/toBeSorted/arc_managers/layout_arc_manager.h new file mode 100644 index 00000000..0534cf2f --- /dev/null +++ b/include/toBeSorted/arc_managers/layout_arc_manager.h @@ -0,0 +1,29 @@ +#ifndef LAYOUT_ARC_MANAGER_H +#define LAYOUT_ARC_MANAGER_H + +#include +#include +#include + +class LayoutArcManager { + LayoutArcManager(); + virtual ~LayoutArcManager(); + + dRawArcTable_c mArcTable; + + static LayoutArcManager *sInstance; + + static bool create(EGG::Heap *heap); + + void init(EGG::Heap *heap); + + bool loadLayoutArcFromDisk(const char *object, EGG::Heap *heap); + void ensureLoaded1(const char *object); + void ensureLoaded2(const char *object); + bool hasEntry(const char *object); + bool decrement(const char *path); + void *getData(const char *oarcName, const char *fileName); + void *getLoadedData(const char *path); +}; + +#endif diff --git a/include/toBeSorted/arc_managers/oarc_manager.h b/include/toBeSorted/arc_managers/oarc_manager.h new file mode 100644 index 00000000..96c7e0d7 --- /dev/null +++ b/include/toBeSorted/arc_managers/oarc_manager.h @@ -0,0 +1,36 @@ +#ifndef OARC_MANAGER_H +#define OARC_MANAGER_H + +#include +#include +#include + +class OarcManager { + OarcManager(); + virtual ~OarcManager(); + + dRawArcTable_c mArcTable; + + static OarcManager *sInstance; + + static bool create(EGG::Heap *heap); + + void init(EGG::Heap *heap); + + bool checkIfObjectArcExistsOnDisk(const char *object); + bool loadObjectArcFromDisk(const char *object, EGG::Heap *heap); + bool addEntryFromSuperArc(const char *object, void *data, EGG::Heap *heap); + void ensureLoaded1(const char *object); + void ensureLoaded2(const char *object); + bool decrement(const char *path); + void *getData(const char *oarcName, const char *fileName); + + void *getMdlFromArc2(const char *oarcName); + void *getMdlFromArc(const char *oarcName); + void *getZevFromArc(const char *oarcName); + void *getDzbFromArc(const char *oarcName, const char *fileName); + void *getPlcFromArc(const char *oarcName, const char *fileName); + void *getSubEntryData(const char *oarcName, const char *fileName); +}; + +#endif diff --git a/src/toBeSorted/arc_managers/current_stage_arc_manager.cpp b/src/toBeSorted/arc_managers/current_stage_arc_manager.cpp index 0e1d7111..f7e26c3d 100644 --- a/src/toBeSorted/arc_managers/current_stage_arc_manager.cpp +++ b/src/toBeSorted/arc_managers/current_stage_arc_manager.cpp @@ -1,42 +1,5 @@ #include -#include -#include -// clang-format off -#include -// clang-format on - -class CurrentStageArcManager { - CurrentStageArcManager(); - virtual ~CurrentStageArcManager(); - - SizedString<32> mStageName; - SizedString<32> mCurrentLoadingStageArcName; - SizedString<32> mStageExtraLayerArcName; - - dRawArcTable_c mArcTable; - - static CurrentStageArcManager *sInstance; - - static bool create(EGG::Heap *heap); - - void init(EGG::Heap *heap); - bool setStage(const char *stage); - bool decrement(); - void *getData(const char *fileName); - void *getFileFromCurrentLay0Arc(const char *fileName); - bool loadFileFromExtraLayerArc(int layer); - bool unloadExtraLayerArc(); - bool loadRoomArc(int room); - bool addEntryFromSuperArc(const char *name, void *data); - bool unloadRoomArc(int room); - bool decrement(const char *path); - void *loadFromRoomArc(int roomId, const char *fileName); - void *getDataFromRoomArc(int roomId, const char *fileName); - const char *getCurrentStageDirectory(); - const char *getRoomArcDirectory(int room) const; - - static EGG::ExpHeap *getHeap(); -}; +#include CurrentStageArcManager *CurrentStageArcManager::sInstance; @@ -54,7 +17,6 @@ void CurrentStageArcManager::init(EGG::Heap *heap) { mArcTable.init(18, &lbl_80575250, heap); } - bool CurrentStageArcManager::setStage(const char *newStage) { mStageName = newStage; @@ -103,7 +65,8 @@ bool CurrentStageArcManager::unloadExtraLayerArc() { } bool CurrentStageArcManager::loadRoomArc(int room) { - return (bool)mArcTable.getArcOrLoadFromDisk(getRoomArcDirectory(room), getCurrentStageDirectory(), 0, dHeap::work2Heap.heap); + return (bool)mArcTable.getArcOrLoadFromDisk(getRoomArcDirectory(room), getCurrentStageDirectory(), 0, + dHeap::work2Heap.heap); } bool CurrentStageArcManager::addEntryFromSuperArc(const char *path, void *data) { diff --git a/src/toBeSorted/arc_managers/layout_arc_manager.cpp b/src/toBeSorted/arc_managers/layout_arc_manager.cpp index 6c38803f..308a6118 100644 --- a/src/toBeSorted/arc_managers/layout_arc_manager.cpp +++ b/src/toBeSorted/arc_managers/layout_arc_manager.cpp @@ -1,30 +1,5 @@ #include -#include -#include -// clang-format off -#include -// clang-format on - -class LayoutArcManager { - LayoutArcManager(); - virtual ~LayoutArcManager(); - - dRawArcTable_c mArcTable; - - static LayoutArcManager *sInstance; - - static bool create(EGG::Heap *heap); - - void init(EGG::Heap *heap); - - bool loadLayoutArcFromDisk(const char *object, EGG::Heap *heap); - void ensureLoaded1(const char *object); - void ensureLoaded2(const char *object); - bool hasEntry(const char *object); - bool decrement(const char *path); - void *getData(const char *oarcName, const char *fileName); - void *getLoadedData(const char *path); -}; +#include LayoutArcManager *LayoutArcManager::sInstance; diff --git a/src/toBeSorted/arc_managers/oarc_manager.cpp b/src/toBeSorted/arc_managers/oarc_manager.cpp index 61a3b650..f791bb76 100644 --- a/src/toBeSorted/arc_managers/oarc_manager.cpp +++ b/src/toBeSorted/arc_managers/oarc_manager.cpp @@ -1,37 +1,5 @@ #include -#include -#include -// clang-format off -#include -// clang-format on - -class OarcManager { - OarcManager(); - virtual ~OarcManager(); - - dRawArcTable_c mArcTable; - - static OarcManager *sInstance; - - static bool create(EGG::Heap *heap); - - void init(EGG::Heap *heap); - - bool checkIfObjectArcExistsOnDisk(const char *object); - bool loadObjectArcFromDisk(const char *object, EGG::Heap *heap); - bool addEntryFromSuperArc(const char *object, void *data, EGG::Heap *heap); - void ensureLoaded1(const char *object); - void ensureLoaded2(const char *object); - bool decrement(const char *path); - void *getData(const char *oarcName, const char *fileName); - - void *getMdlFromArc2(const char *oarcName); - void *getMdlFromArc(const char *oarcName); - void *getZevFromArc(const char *oarcName); - void *getDzbFromArc(const char *oarcName, const char *fileName); - void *getPlcFromArc(const char *oarcName, const char *fileName); - void *getSubEntryData(const char *oarcName, const char *fileName); -}; +#include OarcManager *OarcManager::sInstance;