diff --git a/libultraship b/libultraship index ab9935c0f..d4a22ea7f 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit ab9935c0f4313d253e6c72c96ec6212c7ae96cda +Subproject commit d4a22ea7f78eb275b462ce542815d8368849d526 diff --git a/src/engine/editor/Editor.cpp b/src/engine/editor/Editor.cpp index dc5a69cde..446da7487 100644 --- a/src/engine/editor/Editor.cpp +++ b/src/engine/editor/Editor.cpp @@ -30,7 +30,6 @@ namespace Editor { Editor::Editor() { } - std::vector EditorMatrix; void Editor::Load() { printf("Editor: Loading Editor...\n"); eObjectPicker.Load(); diff --git a/src/engine/editor/EditorMath.cpp b/src/engine/editor/EditorMath.cpp index 4c36a17a2..44923e08e 100644 --- a/src/engine/editor/EditorMath.cpp +++ b/src/engine/editor/EditorMath.cpp @@ -23,6 +23,8 @@ extern "C" { #include "camera.h" } +std::vector EditorMatrix; + bool IsInGameScreen() { auto wnd = GameEngine::Instance->context->GetWindow(); Ship::Coords mouse = wnd->GetMousePos();