From 908de02404ae9da356bbc975ba7594cbc5348f31 Mon Sep 17 00:00:00 2001 From: austin Date: Sat, 10 Jul 2021 00:01:04 -0400 Subject: [PATCH] Disable control during loading screen --- src/main/java/electrosphere/controls/ControlHandler.java | 4 ++++ src/main/java/electrosphere/engine/LoadingThread.java | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/electrosphere/controls/ControlHandler.java b/src/main/java/electrosphere/controls/ControlHandler.java index 60a2c7ab..6147af69 100644 --- a/src/main/java/electrosphere/controls/ControlHandler.java +++ b/src/main/java/electrosphere/controls/ControlHandler.java @@ -87,6 +87,7 @@ public class ControlHandler { TITLE_PAGE, TITLE_MENU, MAIN_GAME, + NO_INPUT, } ControlsState state = ControlsState.TITLE_MENU; @@ -179,6 +180,9 @@ public class ControlHandler { pollTypingControls(); break; + case NO_INPUT: + break; + } } diff --git a/src/main/java/electrosphere/engine/LoadingThread.java b/src/main/java/electrosphere/engine/LoadingThread.java index f4696ae4..091801ea 100644 --- a/src/main/java/electrosphere/engine/LoadingThread.java +++ b/src/main/java/electrosphere/engine/LoadingThread.java @@ -90,6 +90,9 @@ public class LoadingThread extends Thread { loadingBox.setDraw(true); + //disable menu input + Globals.controlHandler.setHandlerState(ControlHandler.ControlsState.NO_INPUT); + //initialize the terrain manager (server only) if(Globals.RUN_SERVER){ initServerGameTerrainManager(); @@ -142,6 +145,7 @@ public class LoadingThread extends Thread { //hide cursor Globals.controlHandler.hideMouse(); + loadingBox.setDraw(false); RenderUtils.recaptureScreen(); @@ -166,8 +170,12 @@ public class LoadingThread extends Thread { case LOAD_ARENA: + loadingBox.setDraw(true); + //disable menu input + Globals.controlHandler.setHandlerState(ControlHandler.ControlsState.NO_INPUT); + //init the data of the world initServerArenaWorldData();