Refactor Menu::getUserChoice to accept an Input object as a parameter.

przemek83 · Oct 2, 2024 · ac86eaa · ac86eaa
1 parent f2fb23e
commit ac86eaa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/Menu.cpp b/src/Menu.cpp
@@ -159,9 +159,8 @@ std::pair<bool, int> Menu::getPointedItem(
     return {false, 0};
 }
 
-UserChoice Menu::getUserChoice()
+UserChoice Menu::getUserChoice(Input& input)
 {
-    Input input;
     int currentItem{0};
     while (true)
     {

diff --git a/src/Menu.h b/src/Menu.h
@@ -8,13 +8,14 @@ class display;
 enum class InputAction : char;
 enum class Level : char;
 enum class UserChoice : char;
+class Input;
 
 class Menu final
 {
 public:
     explicit Menu(Display& display);
 
-    UserChoice getUserChoice();
+    UserChoice getUserChoice(Input& input);
 
     void refresh(UserChoice choice);
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -11,10 +11,11 @@ namespace
 UserChoice getUserChoice(Menu& menu)
 {
     UserChoice choice{UserChoice::MAIN_MENU};
+    Input input;
     while ((choice != UserChoice::EXIT) && (!menu.isLevelPicked(choice)))
     {
         menu.refresh(choice);
-        choice = menu.getUserChoice();
+        choice = menu.getUserChoice(input);
     }
     return choice;
 }