aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorheavydemon21 <nielsstunnebrink1@gmail.com>2024-12-17 14:45:33 +0100
committerheavydemon21 <nielsstunnebrink1@gmail.com>2024-12-17 14:45:33 +0100
commit0524c68cc4eb9fbd36c17ed4f5d8152cac2f977b (patch)
tree831c9a320361a314837625652673207662ce21f9
parent27bf7f7a6e2493b742f502b5da394a5a2d74cdd2 (diff)
parent9232a98b72eee7af4f7f2153c1b2ccedbfa4cc65 (diff)
Merge branch 'master' into niels/UI
-rw-r--r--src/crepe/facade/SDLContext.cpp5
-rw-r--r--src/crepe/facade/SDLContext.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp
index f368828..ada560b 100644
--- a/src/crepe/facade/SDLContext.cpp
+++ b/src/crepe/facade/SDLContext.cpp
@@ -84,9 +84,8 @@ SDLContext::~SDLContext() {
}
Keycode SDLContext::sdl_to_keycode(SDL_Scancode sdl_key) {
- if (!LOOKUP_TABLE.contains(sdl_key)) return Keycode::NONE;
-
- return LOOKUP_TABLE.at(sdl_key);
+ if (!lookup_table.contains(sdl_key)) return Keycode::NONE;
+ return lookup_table.at(sdl_key);
}
const keyboard_state_t & SDLContext::get_keyboard_state() {
diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h
index fc44f82..01d82a0 100644
--- a/src/crepe/facade/SDLContext.h
+++ b/src/crepe/facade/SDLContext.h
@@ -254,7 +254,7 @@ private:
//! variable to store the state of each key (true = pressed, false = not pressed)
keyboard_state_t keyboard_state;
//! lookup table for converting SDL_SCANCODES to Keycodes
- const std::unordered_map<SDL_Scancode, Keycode> LOOKUP_TABLE
+ const std::unordered_map<SDL_Scancode, Keycode> lookup_table
= {{SDL_SCANCODE_SPACE, Keycode::SPACE},
{SDL_SCANCODE_APOSTROPHE, Keycode::APOSTROPHE},
{SDL_SCANCODE_COMMA, Keycode::COMMA},