preparing menu

include/Menu.h

@@ -32,9 +32,7 @@ public:
 
     void display();
 
-    void actionMouse(unsigned int x, unsigned int y, int button);
-
-    void actionKeyboard(int key);
+    void handleKeyboard(KeyboardButton key, bool pressed);
 
 private:
 

src/Menu.cpp

@@ -33,7 +33,7 @@ Menu::Menu() {
 }
 
 Menu::~Menu() {
-
+    delete [] mainText.text;
 }
 
 void Menu::setVisible(bool visible) {
@@ -58,6 +58,7 @@ void Menu::drawText(unsigned int x, unsigned int y, float scale, const char *s,
     w.color[2] = 0xFF;
     w.color[3] = 0xFF;
     gOpenRaider->mWindow->writeString(&w);
+    delete [] w.text;
 }
 
 void Menu::display() {
@@ -79,11 +80,7 @@ void Menu::display() {
     }
 }
 
-void Menu::actionMouse(unsigned int x, unsigned int y, int button) {
-
-}
-
-void Menu::actionKeyboard(int key) {
+void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
 
 }
 

src/OpenRaider.cpp

@@ -483,26 +483,28 @@ void OpenRaider::run() {
 void OpenRaider::handleKeyboard(KeyboardButton key, bool pressed) {
     if ((keyBindings[menu] == key) && pressed) {
         mMenu->setVisible(!mMenu->isVisible());
-    }
-
-    if (keyBindings[console] == key) {
+    } else if (!mMenu->isVisible()) {
+        if (keyBindings[console] == key) {
 
-    } else if (keyBindings[forward] == key) {
+        } else if (keyBindings[forward] == key) {
 
-    } else if (keyBindings[backward] == key) {
+        } else if (keyBindings[backward] == key) {
 
-    } else if (keyBindings[left] == key) {
+        } else if (keyBindings[left] == key) {
 
-    } else if (keyBindings[right] == key) {
+        } else if (keyBindings[right] == key) {
 
-    } else if (keyBindings[jump] == key) {
+        } else if (keyBindings[jump] == key) {
 
-    } else if (keyBindings[crouch] == key) {
+        } else if (keyBindings[crouch] == key) {
 
-    } else if (keyBindings[use] == key) {
+        } else if (keyBindings[use] == key) {
 
-    } else if (keyBindings[holster] == key) {
+        } else if (keyBindings[holster] == key) {
 
+        }
+    } else {
+        mMenu->handleKeyboard(key, pressed);
     }
 }