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

Format code with clang-format.

Browse Source
This commit is contained in:
Derek Christ
2021-07-04 13:12:34 +02:00
parent 9937a36526
commit f816f5f565
37 changed files with 470 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Menu.h
View File

@@ -3,9 +3,9 @@
#include <string>
#include <unordered_map>
#include "Screen.h"
#include "Framebuffer.h"
#include "JsonParser.h"
#include "Screen.h"
#include "eventActions.h"
class Menu
@@ -14,15 +14,15 @@ public:
Menu(Framebuffer *p_framebuffer, ShaderProgram *p_shaderProgram);
~Menu();
Screen *getScreenByName(const std::string& name) const;
void showScreenByName(const std::string& name);
Screen *getScreenByName(const std::string &name) const;
void showScreenByName(const std::string &name);
Screen *getActiveScreen() const;
void writeWindowActions(bool *windowActionRegister);
void resetActiveScreen();
void handleMouseButtonActionRegister(bool *mouseButtonActionRegister, Window* window);
void handleMouseButtonActionRegister(bool *mouseButtonActionRegister, Window *window);
void onPlayPressed();
void onExitPressed();
@@ -33,12 +33,12 @@ private:
bool shouldExit = false;
std::vector<Screen*> screens;
std::vector<Screen *> screens;
Screen *activeScreen;
/*Screen *loadingScreen;
Screen *mainMenuScreen;
Screen *optionMenuScreen;
Screen *pauseMenuScreen;*/
mutable std::unordered_map<std::string, Screen*> m_screen_name_cache;
mutable std::unordered_map<std::string, Screen *> m_screen_name_cache;
};