From 05b142ffa38f6bd233cbdef738ac2736f0a1f5bf Mon Sep 17 00:00:00 2001 From: sitton76 <58642183+sitton76@users.noreply.github.com> Date: Sun, 30 Mar 2025 14:51:17 -0500 Subject: [PATCH 1/3] Fixes to includes to work on Linux. --- src/ending/podium_ceremony_actors.c | 1 + src/engine/AllActors.h | 2 +- src/engine/editor/SceneManager.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ending/podium_ceremony_actors.c b/src/ending/podium_ceremony_actors.c index 288d21897..1e3911287 100644 --- a/src/ending/podium_ceremony_actors.c +++ b/src/ending/podium_ceremony_actors.c @@ -19,6 +19,7 @@ #include "math_util.h" #include +#include "src/port/Game.h" #include "engine/Matrix.h" s32 fireworkConeColour[] = { diff --git a/src/engine/AllActors.h b/src/engine/AllActors.h index e9b74cad5..f6e753761 100644 --- a/src/engine/AllActors.h +++ b/src/engine/AllActors.h @@ -31,7 +31,7 @@ #include "objects/Seagull.h" #include "objects/Thwomp.h" #include "objects/Seagull.h" -#include "objects/Trashbin.h" +#include "objects/TrashBin.h" #include "objects/Trophy.h" #include "objects/Snowman.h" #include "objects/Podium.h" diff --git a/src/engine/editor/SceneManager.cpp b/src/engine/editor/SceneManager.cpp index 81e0a3c60..8a125d1a1 100644 --- a/src/engine/editor/SceneManager.cpp +++ b/src/engine/editor/SceneManager.cpp @@ -8,7 +8,7 @@ #include #include #include "port/Engine.h" -#include +#include #include namespace Editor { From 277d693461d505e8d732a70e2567ce5c4974da5f Mon Sep 17 00:00:00 2001 From: sitton76 <58642183+sitton76@users.noreply.github.com> Date: Sun, 30 Mar 2025 14:51:50 -0500 Subject: [PATCH 2/3] Removed overfilled arguments in gfx_create_framebuffer() --- src/racing/framebuffer_effects.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/racing/framebuffer_effects.c b/src/racing/framebuffer_effects.c index b613043de..eeeefe73b 100644 --- a/src/racing/framebuffer_effects.c +++ b/src/racing/framebuffer_effects.c @@ -20,15 +20,15 @@ s32 buf = -1; void FB_CreateFramebuffers(void) { if (gReusableFrameBuffer == -1) { - gReusableFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, true, true, true); + gReusableFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, true); } if (gN64ResFrameBuffer == -1) { - gN64ResFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, false, true, true); + gN64ResFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, false); } if (buf == -1) { - gN64ResFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, false, true, true); + gN64ResFrameBuffer = gfx_create_framebuffer(SCREEN_WIDTH, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT, false); } } From cfe25a31fc3c766efb3b030a9e196b0c6aff77fc Mon Sep 17 00:00:00 2001 From: sitton76 <58642183+sitton76@users.noreply.github.com> Date: Sun, 30 Mar 2025 14:52:37 -0500 Subject: [PATCH 3/3] Added missing function definitions to Game.h --- src/port/Game.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/port/Game.h b/src/port/Game.h index 472b4f6bf..0cfdb9a9f 100644 --- a/src/port/Game.h +++ b/src/port/Game.h @@ -75,6 +75,8 @@ void CM_TickObjects60fps(); void CM_DrawObjects(s32 cameraId); void CM_TickEditor(); +void CM_DrawEditor(); +void CM_Editor_SetLevelDimensions(s16 minX, s16 maxX, s16 minZ, s16 maxZ, s16 minY, s16 maxY); void CM_TickDraw(); void Editor_ClearMatrix();