diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2025-12-18 11:24:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-18 11:24:38 -0700 |
| commit | f0c2cea0eec6c49a335e9c044fcc28218e1ab749 (patch) | |
| tree | 422128eeb081feffca8ad3ac87566a35358e077f /src/engine/editor | |
| parent | 99b56300556434580ed23edc27e5e7d982751e47 (diff) | |
Impl RandomItemTable class (#598)
* Impl RandomItem class
* Refactor func
* Impl RandomItemTable
* Revert probability inaccuracy
* Remove unnecessary comment
* Fix compile, probably
* As per review 1
---------
Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/engine/editor')
| -rw-r--r-- | src/engine/editor/Editor.h | 8 | ||||
| -rw-r--r-- | src/engine/editor/SceneManager.cpp | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/engine/editor/Editor.h b/src/engine/editor/Editor.h index bfd7b1290..956d795b7 100644 --- a/src/engine/editor/Editor.h +++ b/src/engine/editor/Editor.h @@ -4,6 +4,7 @@ #include <libultraship/libultraship.h> #include <libultra/gbi.h> +#include "defines.h" #ifdef __cplusplus #include "GameObject.h" @@ -57,13 +58,6 @@ private: } // namespace TrackEditor #endif // __cplusplus - -#ifdef __cplusplus -#define EXTERN_C extern "C" -#else -#define EXTERN_C -#endif - EXTERN_C void Editor_Launch(const char* resourceName); EXTERN_C void Editor_SetLevelDimensions(s16 minX, s16 maxX, s16 minZ, s16 maxZ, s16 minY, s16 maxY); EXTERN_C bool Editor_IsEnabled(); diff --git a/src/engine/editor/SceneManager.cpp b/src/engine/editor/SceneManager.cpp index 1a0c129c0..02951e3dc 100644 --- a/src/engine/editor/SceneManager.cpp +++ b/src/engine/editor/SceneManager.cpp @@ -104,7 +104,7 @@ namespace TrackEditor { /** Do not use GetWorld()->CurrentCourse during loading! The current track is not guaranteed! **/ void LoadTrackDataFromJson(Track* track, const std::string& trackPath) { - SPDLOG_INFO("[SceneManager] [LoadTrackDataFromJson] Loading track scenefile..."); + SPDLOG_INFO("[SceneManager] [LoadTrackDataFromJson] Loading Track SceneFile..."); if (trackPath.empty()) { SPDLOG_INFO(" Unable to load track. trackPath empty."); @@ -147,7 +147,7 @@ namespace TrackEditor { LoadActors(track, data); LoadStaticMeshActors(track, data); LoadTour(track, data); - SPDLOG_INFO("[SceneManager] [LoadTrackDataFromJson] Scene File Loaded!"); + SPDLOG_INFO("[SceneManager] [LoadTrackDataFromJson] SceneFile Loaded!\n"); } void LoadTrackInfo(TrackInfo& info, std::shared_ptr<Ship::Archive> archive, std::string sceneFile) { @@ -155,6 +155,7 @@ namespace TrackEditor { SPDLOG_INFO("[SceneManager] [LoadTrackDataFromJson] Failed to load scenefile, track or rootarchive were null"); return; } + SPDLOG_INFO("[SceneManager] [LoadTrackInfo] Loading TrackInfo..."); /* * Manually loading a custom asset file (scene.json) with no extractor class means that @@ -179,7 +180,7 @@ namespace TrackEditor { LoadTrackInfoData(info, data); - SPDLOG_INFO("[SceneManager] [LoadTrackInfo] Loaded track info!"); + SPDLOG_INFO("[SceneManager] [LoadTrackInfo] Loaded TrackInfo!\n"); } void Load_AddStaticMeshActor(const nlohmann::json& actorJson) { |