Added stringifying escape & F keys; add sound, sys FFI; unconflict time.h and timer.h

2022-12-16 19:37:40 +00:00 · 2022-12-16 19:37:40 +00:00 · 3010ce17e5
parent 44d503ae22
commit 3010ce17e5
1 changed files with 0 additions and 5 deletions
--- a/source/engine/input.c
+++ b/source/engine/input.c
@ -104,11 +104,6 @@ void win_key_callback(GLFWwindow *w, int key, int scancode, int action, int mods
                case GLFW_KEY_DOWN:
                    kkey = "down";
                    break;
-<<<<<<< HEAD
-            }
-
-            strcat(keystr, kkey);
-=======

                case GLFW_KEY_LEFT_SHIFT:
                    kkey = "lshift";