diff options
| author | Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> | 2024-10-16 09:00:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-16 09:00:47 -0400 |
| commit | b5aa43ff3780ad11350c3c2efc7a705280818f6c (patch) | |
| tree | 3a10d436d90a59fb4a4fc38cc4af0c5cbe29b923 /src/toBeSorted/arc_callback_handler.cpp | |
| parent | ec4d28cd259fd1f452f716ca032d936a62f79393 (diff) | |
Misc Collision (#51)
* Initial Commit - Starting to translate from TP
* Collision Updates
* Actor Collision -> dBgW (DZB Collision)
* bg .text splits complete
* fix errors
* file organization
* missed files
* progress
* weee
* most of cM3dG
* Revert mAng change
* Progress
* Progress -> Need to update from main
* Fixup Merge
* d_bg_s symbols....
* TList Changes
* oops
* d_bg_s large progress
* d_bg_s_acch majority done
* d_bg_s_chk OK
* d_bg_s_gnd_chk OK
* d_bg_s_grp_pass_chk OK
* d_bg_lin_chk OK
* d_bg_s_poly_pass_chk OK
* d_bg_s_roof_chk and d_bg_s_sph_chk OK
* d_bg_s_spl_grp_chk OK
* d_bg_s_wtr_chk OK
* d_bg_w started
* d_bg_w_base OK
* name d_bg_w_kcol symbols
* d_bg_w_sv split/started
* most of d_bg_w_time
* stopping d_bg_w_kcol for now
* d_bg_w_sv OK
* work on d_bg_w_time
* revert TList to take offset arg
* fixup some compiler warnings
* set c_bg_w OK
* Update rel_sieve.py
* Remove TList Macros
* Bomb Header started
Diffstat (limited to 'src/toBeSorted/arc_callback_handler.cpp')
| -rw-r--r-- | src/toBeSorted/arc_callback_handler.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/toBeSorted/arc_callback_handler.cpp b/src/toBeSorted/arc_callback_handler.cpp index 0bfd7f96..9b79d21c 100644 --- a/src/toBeSorted/arc_callback_handler.cpp +++ b/src/toBeSorted/arc_callback_handler.cpp @@ -1,23 +1,24 @@ +#include <d/col/bg/d_bg_s.h> +#include <d/col/bg/d_bg_w_kcol.h> #include <d/d_rawarchive.h> #include <egg/gfx/eggLight.h> #include <m/m3d/m3d.h> -#include <toBeSorted/arc_managers/oarc_manager.h> -#include <toBeSorted/arc_managers/current_stage_arc_manager.h> #include <nw4r/g3d/g3d_resfile.h> -#include <nw4r/g3d/g3d_resmdl.h> #include <nw4r/g3d/g3d_resmat.h> +#include <nw4r/g3d/g3d_resmdl.h> +#include <toBeSorted/arc_managers/current_stage_arc_manager.h> +#include <toBeSorted/arc_managers/oarc_manager.h> ArcCallbackHandler ArcCallbackHandler::sInstance; -#define NAME_DZB 'dzb ' -#define NAME_G3D 'g3d ' -#define NAME_KCL 'kcl ' +#define NAME_DZB 'dzb ' +#define NAME_G3D 'g3d ' +#define NAME_KCL 'kcl ' #define NAME_OARC 'oarc' #define NAME_RARC 'rarc' 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()) { @@ -48,9 +49,6 @@ void BindSystemModelsAndLighting(nw4r::g3d::ResFile file) { } } -extern "C" void fn_8033A140(void *data); -extern "C" void dBgWKCol__initKCollision(void *dat); - void ArcCallbackHandlerBase::CreateArcEntry(void *data, const char *path) { if (mPrefix == NAME_G3D) { nw4r::g3d::ResFile file = data; @@ -58,9 +56,9 @@ void ArcCallbackHandlerBase::CreateArcEntry(void *data, const char *path) { file.Bind(); BindSystemModelsAndLighting(file); } else if (mPrefix == NAME_KCL) { - dBgWKCol__initKCollision(data); + dBgWKCol::initKCollision(data); } else if (mPrefix == NAME_DZB) { - fn_8033A140(data); + cBgS::ConvDzb(data); } else if (mPrefix == NAME_OARC) { SizedString<64> oarcPath = path; char buf[64]; |