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

[Fix] Fixed double free.

Browse Source
This commit is contained in:
Allanis 2013-12-31 03:40:24 +00:00
parent 74719f2cbd
commit 1411001943
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/input.c
View File

@ -74,13 +74,13 @@ void input_setDefault(void) {
input_setKeybind("target_hostile", KEYBIND_KEYBOARD, SDLK_r, KMOD_NONE, 0); input_setKeybind("target_hostile", KEYBIND_KEYBOARD, SDLK_r, KMOD_NONE, 0);
/* Combat. */ /* Combat. */
input_setKeybind("primary", KEYBIND_KEYBOARD, SDLK_SPACE, KMOD_NONE, 0); input_setKeybind("primary", KEYBIND_KEYBOARD, SDLK_SPACE, KMOD_NONE, 0);
input_setKeybind("face", KEYBIND_KEYBOARD, SDLK_1, KMOD_NONE, 0); input_setKeybind("face", KEYBIND_KEYBOARD, SDLK_f, KMOD_NONE, 0);
input_setKeybind("board", KEYBIND_KEYBOARD, SDLK_b, KMOD_NONE, 0); input_setKeybind("board", KEYBIND_KEYBOARD, SDLK_b, KMOD_NONE, 0);
/* Escorts. */ /* Escorts. */
input_setKeybind("e_attack", KEYBIND_KEYBOARD, SDLK_f, KMOD_NONE, 0); input_setKeybind("e_attack", KEYBIND_KEYBOARD, SDLK_1, KMOD_NONE, 0);
input_setKeybind("e_hold", KEYBIND_KEYBOARD, SDLK_g, KMOD_NONE, 0); input_setKeybind("e_hold", KEYBIND_KEYBOARD, SDLK_2, KMOD_NONE, 0);
input_setKeybind("e_return", KEYBIND_KEYBOARD, SDLK_r, KMOD_NONE, 0); input_setKeybind("e_return", KEYBIND_KEYBOARD, SDLK_3, KMOD_NONE, 0);
input_setKeybind("e_clear", KEYBIND_KEYBOARD, SDLK_c, KMOD_NONE, 0); input_setKeybind("e_clear", KEYBIND_KEYBOARD, SDLK_4, KMOD_NONE, 0);
/* Secondary weapon. */ /* Secondary weapon. */

1
src/lephisto.c
View File

@ -236,7 +236,6 @@ int main(int argc, char** argv) {
player_cleanup(); /* Cleans up the player stuff. */ player_cleanup(); /* Cleans up the player stuff. */
gui_free(); /* Free up the gui. */ gui_free(); /* Free up the gui. */
weapon_exit(); /* Destroy all active weapons. */ weapon_exit(); /* Destroy all active weapons. */
space_exit(); /* Clean up the universe!!! */
pilots_free(); /* Free the pilots, they where locked up D: */ pilots_free(); /* Free the pilots, they where locked up D: */
space_exit(); /* Cleans up the universe itself. */ space_exit(); /* Cleans up the universe itself. */