Fix bug
This commit is contained in:
2
data/res
2
data/res
Submodule data/res updated: 84f2a02390...598d92bdd6
@@ -172,7 +172,9 @@ void Controller::run()
|
||||
menu->writeWindowActions(gameEventHandler->getWindowActionRegister());
|
||||
gameWindow->handleWindowActionRegister(gameEventHandler->getWindowActionRegister());
|
||||
|
||||
menu->handleMouseButtonActionRegister(gameEventHandler->getMouseButtonActionRegister(), gameWindow);
|
||||
// Handle widget pressed event only when a screen is currently active
|
||||
if (menu->getActiveScreen())
|
||||
menu->handleMouseButtonActionRegister(gameEventHandler->getMouseButtonActionRegister(), gameWindow);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,11 +4,6 @@
|
||||
#include "helper.h"
|
||||
#include <iostream>
|
||||
|
||||
void (Menu::*widgetPressedActionRegister[widgetPressedActions::WIDGET_PRESSED_ACTION_NUM_ITEMS])() = {
|
||||
&Menu::onPlayPressed,
|
||||
&Menu::onExitPressed
|
||||
};
|
||||
|
||||
Menu::Menu(Framebuffer *p_framebuffer, ShaderProgram *p_shaderProgram) :
|
||||
framebuffer(p_framebuffer), shaderProgram(p_shaderProgram)
|
||||
{
|
||||
|
||||
@@ -26,8 +26,6 @@ public:
|
||||
void onPlayPressed();
|
||||
void onExitPressed();
|
||||
|
||||
void (*widgetPressedActionRegister[widgetPressedActions::WIDGET_PRESSED_ACTION_NUM_ITEMS])();
|
||||
|
||||
private:
|
||||
Framebuffer *framebuffer;
|
||||
ShaderProgram *shaderProgram;
|
||||
|
||||
@@ -29,9 +29,3 @@ enum mouseButtonActions {
|
||||
middleClicked,
|
||||
MOUSE_BUTTON_ACTION_NUM_ITEMS
|
||||
};
|
||||
|
||||
enum widgetPressedActions {
|
||||
playClicked,
|
||||
exitClicked,
|
||||
WIDGET_PRESSED_ACTION_NUM_ITEMS
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user