From b934e98fc34964970ab5efacb2fb7c3372ae0b1a Mon Sep 17 00:00:00 2001 From: MegaMech Date: Sat, 13 Dec 2025 11:50:28 -0700 Subject: Refactor Track Class To Instantiate On Track Load (#587) * Initial Commit * First compilation of Registry template * Further changes * wip changes * Impl TrackBrowser and Registry Info * Remove const from TInfo * Prep GetWorld * Name refactor * Refactor gWorldInstance to GetWorld() * wip * Should work now * Data menu work again * Fix editor staying open after program close * Rename LoadLevel to LoadTrackDataFromJson * More changes * Add statue * Add search to content browser using tags * Fix statue pos and register tags * Fix actor loading * Fix delete all bug which deleted cameras * reduce some boiler plate in actor and object * Remove unused rulesets * Search bar for all tabs * fix data screen * fix actor spawning * temp editor fix * Clean up * improve extra mode transformation * fix podium crash * Fix editor clicking * Fix editor clicking 2 * fix extra in custom track * Fix FI for three actors * Fix divide by zero error * Ids managed by Registry * Add scary comment --------- Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com> Co-authored-by: coco875 --- src/engine/objects/Trophy.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/engine/objects/Trophy.cpp') diff --git a/src/engine/objects/Trophy.cpp b/src/engine/objects/Trophy.cpp index 44b9e7e51..760c16138 100644 --- a/src/engine/objects/Trophy.cpp +++ b/src/engine/objects/Trophy.cpp @@ -92,7 +92,7 @@ OTrophy::OTrophy(const SpawnParams& params) : OObject(params) { object->pos[1] = spawnPos.y; object->pos[2] = spawnPos.z; - _emitter = reinterpret_cast(gWorldInstance.AddEmitter(new StarEmitter())); + _emitter = reinterpret_cast(GetWorld()->AddEmitter(new StarEmitter())); } void OTrophy::SetSpawnParams(SpawnParams& params) { @@ -228,6 +228,11 @@ void OTrophy::Draw(s32 cameraId) { Mat4 someMatrix1; Mat4 someMatrix2; Object* object; + + if (Editor_IsPaused()) { + return; + } + if (*_toggleVisibility == true) { object = &gObjectList[listIndex]; if (object->state >= 2) { -- cgit v1.2.3