From 7cc9894aa12175f10ad91174cff41ef1701df166 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Thu, 15 May 2025 15:25:18 -0600 Subject: Fix compile (#199) * Fixes made so far * Fixes up until linking * Moved GetInterpreter() to a single function under the Engine.h * Updated shader files included with assets, added exception for Linux for including SDL2_net * Removed osSetTime stub(for now) * Adjustments to get it to compile + run * Decoupled GetInterpreter() from the GameEngine Class, corrected a invalid include in SpaghettiGui.cpp --------- Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com> --- src/engine/editor/EditorMath.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/engine/editor/EditorMath.cpp') diff --git a/src/engine/editor/EditorMath.cpp b/src/engine/editor/EditorMath.cpp index a3e19716c..4c36a17a2 100644 --- a/src/engine/editor/EditorMath.cpp +++ b/src/engine/editor/EditorMath.cpp @@ -28,7 +28,7 @@ bool IsInGameScreen() { Ship::Coords mouse = wnd->GetMousePos(); // Define viewport boundaries - auto gfx_current_game_window_viewport = GameEngine::GetInterpreter().get()->mGameWindowViewport; + auto gfx_current_game_window_viewport = GetInterpreter()->mGameWindowViewport; int left = gfx_current_game_window_viewport.width; int right = left + OTRGetGameRenderWidth(); int top = gfx_current_game_window_viewport.height; @@ -43,7 +43,7 @@ FVector ScreenRayTrace() { Camera* camera = &cameras[0]; Ship::Coords mouse = wnd->GetMousePos(); - auto gfx_current_game_window_viewport = GameEngine::GetInterpreter().get()->mGameWindowViewport; + auto gfx_current_game_window_viewport = GetInterpreter()->mGameWindowViewport; mouse.x -= gfx_current_game_window_viewport.width; mouse.y -= gfx_current_game_window_viewport.height; // Get screen dimensions -- cgit v1.2.3