diff options
| author | Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> | 2025-02-09 12:40:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-09 12:40:41 -0500 |
| commit | cec09ad02349a1058e2255d2bc0b68ad69885075 (patch) | |
| tree | 115af5aee890e1a0fd3a0b3031beefac35cfd308 /src/toBeSorted/arc_callback_handler.cpp | |
| parent | 85bef3afb9605a6f084e35b5740a5f1b6655bfe3 (diff) | |
g3d initial pullover (#115)
* g3d Headers
* initial g3d source files -- NOT YET FIXED
* change ResFile static_cast to explicit ctor
Diffstat (limited to 'src/toBeSorted/arc_callback_handler.cpp')
| -rw-r--r-- | src/toBeSorted/arc_callback_handler.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/toBeSorted/arc_callback_handler.cpp b/src/toBeSorted/arc_callback_handler.cpp index 8439aec8..4112fcfd 100644 --- a/src/toBeSorted/arc_callback_handler.cpp +++ b/src/toBeSorted/arc_callback_handler.cpp @@ -3,9 +3,7 @@ #include "d/d_rawarchive.h" #include "egg/gfx/eggLight.h" #include "m/m3d/m3d.h" -#include "nw4r/g3d/g3d_resfile.h" -#include "nw4r/g3d/g3d_resmat.h" -#include "nw4r/g3d/g3d_resmdl.h" +#include "nw4r/g3d.h" // IWYU pragma: export #include "toBeSorted/arc_managers/current_stage_arc_manager.h" #include "toBeSorted/arc_managers/oarc_manager.h" @@ -20,8 +18,8 @@ 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"); - if (sysFile.mFile.IsValid()) { + nw4r::g3d::ResFile sysFile(OarcManager::sInstance->getMdlFromArc2("System")); + if (sysFile.IsValid()) { file.Bind(sysFile); } @@ -51,7 +49,7 @@ void BindSystemModelsAndLighting(nw4r::g3d::ResFile file) { void ArcCallbackHandlerBase::CreateArcEntry(void *data, const char *path) { if (mPrefix == NAME_G3D) { - nw4r::g3d::ResFile file = data; + nw4r::g3d::ResFile file(data); file.Init(); file.Bind(); BindSystemModelsAndLighting(file); |