80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

Updated the code to work correctly after akari/screenshot merge

Browse source
This commit is contained in:
Akari 2011-07-03 21:22:13 +03:00
parent db2842e595
commit 7d9853f96c
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/menu/options.c
View file

@ -278,8 +278,7 @@ void create_options_menu(MenuData *m) {
add_menu_entry(m, "Bomb", do_nothing, NULL);
add_menu_entry(m, " ", NULL, NULL);
add_menu_entry(m, "Toggle fullscreen", do_nothing, NULL); // entry 13
// UNCOMMENT after akari/screenshot is merged
//add_menu_entry(m, "Take a screenshot", do_nothing, NULL);
add_menu_entry(m, "Take a screenshot", do_nothing, NULL);
add_menu_entry(m, " ", NULL, NULL);
//add_menu_entry(m, "Customize controls", NULL, NULL);
add_menu_entry(m, "Return to the main menu", backtomain, m);
@ -309,8 +308,7 @@ void create_options_menu(MenuData *m) {
bind_keybinding_to_entry(m, 11, "key_bomb", KEY_BOMB);
bind_keybinding_to_entry(m, 13, "key_fullscreen", KEY_FULLSCREEN);
// UNCOMMENT after akari/screenshot is merged
//bind_keybinding_to_entry(m, 14, "key_screenshot", KEY_SCREENSHOT);
bind_keybinding_to_entry(m, 14, "key_screenshot", KEY_SCREENSHOT);
bindings_initvalues(m);
}
@ -449,14 +447,10 @@ void options_menu_input(MenuData *menu) {
return;
}
// REMOVE after akari/screenshot is merged
global_input();
while(SDL_PollEvent(&event)) {
int sym = event.key.keysym.sym;
// UNCOMMENT after akari/screenshot is merged
//global_processevent(&event);
global_processevent(&event);
if(event.type == SDL_KEYDOWN) {
if(sym == tconfig.intval[KEY_DOWN]) {
menu->drawdata[3] = 10;