Skip to content
Snippets Groups Projects
Commit 4701ba8c authored by eliasmorio's avatar eliasmorio
Browse files

fix keys

parent 1376bb1e
Branches
No related tags found
No related merge requests found
...@@ -95,9 +95,9 @@ void Menu::handleInput() { ...@@ -95,9 +95,9 @@ void Menu::handleInput() {
switch (currentState) { switch (currentState) {
case MenuState::MAIN_MENU: case MenuState::MAIN_MENU:
if (key == 'U') { if (key == 'w') {
selectedOption = (selectedOption > 0) ? selectedOption - 1 : 2; selectedOption = (selectedOption > 0) ? selectedOption - 1 : 2;
} else if (key == 'D') { } else if (key == 's') {
selectedOption = (selectedOption < 2) ? selectedOption + 1 : 0; selectedOption = (selectedOption < 2) ? selectedOption + 1 : 0;
} else if (key == ' ') { } else if (key == ' ') {
switch (selectedOption) { switch (selectedOption) {
...@@ -121,9 +121,9 @@ void Menu::handleInput() { ...@@ -121,9 +121,9 @@ void Menu::handleInput() {
break; break;
case MenuState::SHIP_SELECTION: case MenuState::SHIP_SELECTION:
if (key == 'L') { if (key == 'a') {
selectedShip = (selectedShip > 0) ? selectedShip - 1 : 4; selectedShip = (selectedShip > 0) ? selectedShip - 1 : 4;
} else if (key == 'R') { } else if (key == 'd') {
selectedShip = (selectedShip < 4) ? selectedShip + 1 : 0; selectedShip = (selectedShip < 4) ? selectedShip + 1 : 0;
} else if (key == ' ' || key == 27) { // Space or ESC } else if (key == ' ' || key == 27) { // Space or ESC
currentState = MenuState::MAIN_MENU; currentState = MenuState::MAIN_MENU;
......
...@@ -24,6 +24,8 @@ extern size_t bootstrap_stack_size; //Taille de la pile d'exécution ...@@ -24,6 +24,8 @@ extern size_t bootstrap_stack_size; //Taille de la pile d'exécution
extern char __e_kernel,__b_kernel, __b_data, __e_data, __b_stack, __e_load ; extern char __e_kernel,__b_kernel, __b_data, __e_data, __b_stack, __e_load ;
Clavier clavier;
extern "C" void Sextant_main(unsigned long magic, unsigned long addr){ extern "C" void Sextant_main(unsigned long magic, unsigned long addr){
idt_setup(); idt_setup();
irq_setup(); irq_setup();
...@@ -46,7 +48,7 @@ extern "C" void Sextant_main(unsigned long magic, unsigned long addr){ ...@@ -46,7 +48,7 @@ extern "C" void Sextant_main(unsigned long magic, unsigned long addr){
menu.init(); menu.init();
menu.run(); menu.run();
Game game; Game game(&clavier);
game.init(menu.getSelectedShip()); game.init(menu.getSelectedShip());
score = game.start(); score = game.start();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment