5 files changed, 30 insertions, 1 deletions

@@ -75,6 +75,10 @@ void InputSystem::tick(double dt) {
           }
         }
       } else if (e.key.keysym.sym == SDLK_SPACE) {
+        if (game_.getSystem<MenuSystem>().isMenuOpen()) {
+          game_.getSystem<MenuSystem>().activateOption();
+        }
+
         if (game_.isGameplayPaused()) continue;
 
         // If there is text on screen, try to advance it.
@@ -1,10 +1,13 @@
 #ifndef MENU_H_3F6E62B3
 #define MENU_H_3F6E62B3
 
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
 
+class Game;
+
 enum class MenuType {
   Command
 };
@@ -12,6 +15,7 @@ enum class MenuType {
 struct MenuItem {
   MenuType type = MenuType::Command;
   std::string text;
+  std::function<void(Game&)> activationFunction;
 };
 
 class MenuBuilder {
@@ -23,6 +27,11 @@ public:
     return *this;
   }
 
+  MenuBuilder& ActivationFunction(std::function<void(Game&)> val) {
+    result_.activationFunction = std::move(val);
+    return *this;
+  }
+
   MenuItem Build() const {
     return result_;
   }
@@ -40,8 +40,14 @@ void MenuSystem::openPauseMenu() {
 
   menu_ = CreateMenu({
     MenuBuilder().Command("Settings"),
-    MenuBuilder().Command("Return to Main Menu"),
     MenuBuilder().Command("Resume Game")
+                 .ActivationFunction([] (Game& game) {
+                   game.getSystem<MenuSystem>().closePauseMenu();
+                 }),
+    MenuBuilder().Command("Quit")
+                 .ActivationFunction([] (Game& game) {
+                   game.quit();
+                 })
   });
 
   cursor_ = 0;
@@ -77,3 +83,11 @@ void MenuSystem::pressedDown() {
 
   game_.getMixer().playSound("../res/sfx/vertical_menu.wav");
 }
+
+void MenuSystem::activateOption() {
+  game_.getMixer().playSound("../res/sfx/menu_activate.wav");
+
+  if (menu_[cursor_].type == MenuType::Command && menu_[cursor_].activationFunction) {
+    menu_[cursor_].activationFunction(game_);
+  }
+}
@@ -28,6 +28,8 @@ public:
 
   void pressedDown();
 
+  void activateOption();
+
   // Info
 
   double getPauseAnimationProgress() const { return pauseAnimation_.getProgress(); }