Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Change] Gave afterburn it's own keybind (for joysticks).

Browse Source
This commit is contained in:
Allanis 2013-12-17 20:12:28 +00:00
parent 37b1d50654
commit fe6f5b27ef
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/input.c
View File

@ -31,7 +31,7 @@ static Keybind** input_keybinds; /**< Contains the players keybindings. */
/* Name of each keybinding. */ /* Name of each keybinding. */
const char* keybindNames[] = { const char* keybindNames[] = {
/* Movement. */ /* Movement. */
"accel", "left", "right", "reverse", "accel", "left", "right", "reverse", "afterburn",
/* Targetting. */ /* Targetting. */
"target", "target_nearest", "target_hostile", "target", "target_nearest", "target_hostile",
/* Fighting. */ /* Fighting. */
@ -52,8 +52,6 @@ unsigned int input_afterburnSensibility = 200; /**< ms between taps to afterbur
/* From player.c */ /* From player.c */
extern double player_turn; extern double player_turn;
extern unsigned int player_target; extern unsigned int player_target;
/* Grabbed from main.c */
extern int show_fps;
/** /**
@ -64,6 +62,7 @@ extern int show_fps;
void input_setDefault(void) { void input_setDefault(void) {
/* Movement. */ /* Movement. */
input_setKeybind("accel", KEYBIND_KEYBOARD, SDLK_w, 0); input_setKeybind("accel", KEYBIND_KEYBOARD, SDLK_w, 0);
input_setKeybind("afterburn", KEYBIND_KEYBOARD, SDLK_UNKNOWN, 0); /* Not set. */
input_setKeybind("left", KEYBIND_KEYBOARD, SDLK_a, 0); input_setKeybind("left", KEYBIND_KEYBOARD, SDLK_a, 0);
input_setKeybind("right", KEYBIND_KEYBOARD, SDLK_d, 0); input_setKeybind("right", KEYBIND_KEYBOARD, SDLK_d, 0);
input_setKeybind("reverse", KEYBIND_KEYBOARD, SDLK_s, 0); input_setKeybind("reverse", KEYBIND_KEYBOARD, SDLK_s, 0);
@ -203,6 +202,10 @@ static void input_key(int keynum, double value, int kabs) {
if(value == KEY_PRESS) input_accelLast = t; if(value == KEY_PRESS) input_accelLast = t;
} }
else if(KEY("afterburn") && INGAME() && NOHYP()) {
if(value == KEY_PRESS) player_afterburn();
else if(value == KEY_RELEASE) player_afterburnOver();
}
/* Turning left. */ /* Turning left. */
else if(KEY("left")) { else if(KEY("left")) {
player_abortAutonav(); player_abortAutonav();
@ -212,7 +215,7 @@ static void input_key(int keynum, double value, int kabs) {
if(kabs) { player_turn = -value; } if(kabs) { player_turn = -value; }
else { player_turn -= value; } else { player_turn -= value; }
if(player_turn < -1.) { player_turn = -1.; }/* Make sure value is sane. */ if(player_turn < -1.) player_turn = -1.; /* Make sure value is sane. */
} }
/* Turning right. */ /* Turning right. */
else if(KEY("right")) { else if(KEY("right")) {