.ccls

@@ -3,7 +3,7 @@ gcc
 -Isrc/headers
 -Isrc/ecs/headers
 -Isrc/ecs/components/headers
--ISDL2_Core/src/headers
+-ISDL_Core/src/headers
-#-INCurses_Core/src/headers
+-INCurses_Core/src/headers
 -Iassets/asset_builder/src/headers
 -DASSET_FILE_NAME="$(make print-ASSET_OUTPUT)"

Makefile

@@ -28,7 +28,7 @@ all: build_core build_src build_assets
 
 # Sub Makefiles
 SOURCE_DIR = src
-CORE_DIR = SDL2_Core/src
+CORE_DIR = SDL_Core/src
 ASSETS_DIR = assets
 
 include $(CORE_DIR)/Makefile

NCurses_Core

@@ -1 +1 @@
-Subproject commit 1821d2092357eecc3ed4999751fb1a71b521324b
+Subproject commit 0ef33e0b09c5834dbca891f86e2b4f89a55d3ffb

SDL2_Core

@@ -1 +0,0 @@
-Subproject commit 91709bfacc498483ac92cf71364dff790ff83a27

SDL_Core

@@ -0,0 +1 @@
+Subproject commit c1a3dea5609002d1be55a3e5a2c11ebc0fa7e57e

shell.nix

@@ -9,12 +9,11 @@ stdenv.mkDerivation {
     valgrind
   ];
   buildInputs = [
-    libpng
     SDL2
-    ncurses
+    libpng
   ];
   shellHook = ''
-    export LD_LIBRARY_PATH=${pkgs.libpng}/lib:${pkgs.SDL2}/lib:${pkgs.sdl3}/lib:${pkgs.ncurses}/lib:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH=${pkgs.SDL2}/lib:${pkgs.sdl3}/lib:${pkgs.libpng}/lib:$LD_LIBRARY_PATH
-    export PKG_CONFIG_PATH=${pkgs.libpng}/lib/pkgconfig:${pkgs.SDL2}/lib/pkgconfig:${pkgs.sdl3}/lib/pkgconfig:${pkgs.ncurses}/lib/pkgconfig:$PKG_CONFIG_PATH
+    export PKG_CONFIG_PATH=${pkgs.SDL2}/lib/pkgconfig:${pkgs.libpng}/lib/pkgconfig:$PKG_CONFIG_PATH
   '';
 }

src/game.c

@@ -33,9 +33,9 @@ void game_handle_event(void)
     while(pollevent(&event))
     {
         if(event.type == EVENT_KEY_DOWN)
-            game.events.keys[event.key] = true;
+            game.events.keys[event.key.keysym.scancode] = true;
         else if(event.type == EVENT_KEY_UP)
-            game.events.keys[event.key] = false;
+            game.events.keys[event.key.keysym.scancode] = false;
 
         if(event.type == EVENT_QUIT)
             game.is_running = false;