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

This commit is contained in:
John Alanbrook 2022-12-16 19:29:50 +00:00
parent 6227754925
commit 44d503ae22

View file

@ -104,9 +104,41 @@ 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";
break;
case GLFW_KEY_RIGHT_SHIFT:
kkey = "rshift";
break;
case GLFW_KEY_LEFT_CONTROL:
kkey = "lctrl";
break;
case GLFW_KEY_LEFT_ALT:
kkey = "lalt";
break;
case GLFW_KEY_RIGHT_CONTROL:
kkey = "rctrl";
break;
case GLFW_KEY_RIGHT_ALT:
kkey= "ralt";
break;
}
if (kkey)
strcat(keystr, kkey);
else
YughWarn("Could not get key string for key %d, scancode %d.", key, scancode);
}
@ -190,4 +222,4 @@ int want_quit() {
void quit() {
YughInfo("Exiting game.");
mquit = 1;
}
}