diff options
| author | JAROWMR <jarorutjes07@gmail.com> | 2025-01-03 19:43:43 +0100 |
|---|---|---|
| committer | JAROWMR <jarorutjes07@gmail.com> | 2025-01-03 19:43:43 +0100 |
| commit | 41b1941f9ce1b0b31d2d5a3f0b34b0d3d6a0027a (patch) | |
| tree | e29ab87019301984273ce2a08910fa6c2cbbe149 /src/crepe/system | |
| parent | 4f687de3530fac052f30dac7b8c59dae103bcf81 (diff) | |
| parent | cf6ca6be5a9deac4de921f50d0aedf6a6156e0f4 (diff) | |
Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menu
Diffstat (limited to 'src/crepe/system')
| -rw-r--r-- | src/crepe/system/InputSystem.cpp | 4 | ||||
| -rw-r--r-- | src/crepe/system/InputSystem.h | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/crepe/system/InputSystem.cpp b/src/crepe/system/InputSystem.cpp index b4a0633..91c9c64 100644 --- a/src/crepe/system/InputSystem.cpp +++ b/src/crepe/system/InputSystem.cpp @@ -1,8 +1,8 @@ #include "../api/Button.h" +#include "../api/Config.h" #include "../facade/SDLContext.h" #include "../manager/ComponentManager.h" #include "../manager/EventManager.h" -#include "util/Log.h" #include "InputSystem.h" @@ -213,7 +213,7 @@ bool InputSystem::is_mouse_inside_button( const Transform & cam_transform ) { vec2 actual_pos = transform.position + button.offset; - if (!button.world_space) { + if (!button.data.world_space) { actual_pos += cam_transform.position; } vec2 half_dimensions = button.dimensions / 2; diff --git a/src/crepe/system/InputSystem.h b/src/crepe/system/InputSystem.h index 37311cc..be62367 100644 --- a/src/crepe/system/InputSystem.h +++ b/src/crepe/system/InputSystem.h @@ -1,12 +1,9 @@ #pragma once -#include "../api/Config.h" -#include "../facade/EventData.h" - #include "../api/Event.h" #include "../api/Metadata.h" +#include "../facade/EventData.h" #include "../types.h" -#include "../util/OptionalRef.h" #include "System.h" |