After merge fixes
This commit is contained in:
@@ -65,8 +65,8 @@
|
||||
|
||||
#include "GUI/Frame.h"
|
||||
#include "GUI/Button.h"
|
||||
#include "Game/MainMenu.h"
|
||||
#include "Game/HUD.h"
|
||||
#include "Game/GUI/MainMenu.h"
|
||||
#include "Game/GUI/HUD.h"
|
||||
|
||||
namespace dd
|
||||
{
|
||||
|
||||
@@ -215,6 +215,10 @@ private:
|
||||
EventRelay<Frame, Events::KeyDown> m_EKeyDown;
|
||||
bool OnKeyDown(const Events::KeyDown& event)
|
||||
{
|
||||
if (Hidden()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (event.KeyCode == GLFW_KEY_SPACE) {
|
||||
m_LoadingFrame->CancelPreload();
|
||||
Events::GameStart e;
|
||||
|
||||
Reference in New Issue
Block a user