Fix keyboard controls

This commit is contained in:
2014-04-14 14:28:23 -04:00
parent fa551c8f43
commit b36c9778c6

View File

@@ -1594,8 +1594,7 @@ bool handle_keystroke(sf::Event& event){
using kb = sf::Keyboard; using kb = sf::Keyboard;
using Key = sf::Keyboard::Key; using Key = sf::Keyboard::Key;
// TODO: Make sure these are in the right order Key keypad[10] = {kb::Numpad0,kb::Numpad1,kb::Numpad2,kb::Numpad3,kb::Numpad4,kb::Numpad5,kb::Numpad6,kb::Numpad7,kb::Numpad8,kb::Numpad9};
char keypad[10] = {kb::Numpad7,kb::Numpad8,kb::Numpad9,kb::Numpad4,kb::Numpad5,kb::Numpad6,kb::Numpad1,kb::Numpad2,kb::Numpad3,kb::Numpad0};
// TODO: The duplication of location here shouldn't be necessary... // TODO: The duplication of location here shouldn't be necessary...
location terrain_click[10] = {location{150,185},location{120,215},location{150,215},location{180,215}, location terrain_click[10] = {location{150,185},location{120,215},location{150,215},location{180,215},
location{120,185},location{150,185},location{180,185}, location{120,185},location{150,185},location{180,185},
@@ -2136,7 +2135,7 @@ bool handle_keystroke(sf::Event& event){
pass_point.y = bottom_buttons[j].top + 5; pass_point.y = bottom_buttons[j].top + 5;
pass_event.mouseButton.x = pass_point.x + ul.x; pass_event.mouseButton.x = pass_point.x + ul.x;
pass_event.mouseButton.y = pass_point.y + ul.y; pass_event.mouseButton.y = pass_point.y + ul.y;
are_done = handle_action(event); are_done = handle_action(pass_event);
} }
break; break;
} }