derek/fall-fever
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor events.

Browse Source
This commit is contained in:
Derek Christ
2021-07-04 15:26:52 +02:00
parent f816f5f565
commit 4ab5d205ac
28 changed files with 231 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Menu.cpp
View File

@@ -1,7 +1,7 @@
#include "Menu.h"
#include "Helper.h"
#include "JsonParser.h"
#include "eventActions.h"
#include "definitions/eventActions.h"
#include <iostream>
@@ -56,9 +56,9 @@ void Menu::resetActiveScreen()
activeScreen = nullptr;
}
void Menu::handleMouseButtonActionRegister(bool *mouseButtonActionRegister, Window *window)
void Menu::handleMouseButtonActionMap(const MouseButtonActionMap &mouseButtonActionMap, Window *window)
{
if (mouseButtonActionRegister[mouseButtonActions::leftClicked]) {
if (mouseButtonActionMap.at(MouseButtonAction::LeftClicked)) {
auto widgets = activeScreen->getWidgets();
for (auto it = widgets.begin(); it != widgets.end(); it++) {
if ((*it)->isHovered(window)) {
@@ -72,10 +72,10 @@ void Menu::handleMouseButtonActionRegister(bool *mouseButtonActionRegister, Wind
}
}
void Menu::writeWindowActions(bool *windowActionRegister)
void Menu::writeWindowActions(WindowActionMap &windowActionMap)
{
if (shouldExit)
windowActionRegister[windowActions::windowShouldClose] = true;
windowActionMap[WindowAction::WindowShouldClose] = true;
}
void Menu::onPlayPressed()