Better handle renderer

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / GameScreen.java

diff --git a/core/src/ru/deadsoftware/cavedroid/GameScreen.java b/core/src/ru/deadsoftware/cavedroid/GameScreen.java
index 286ba49ed846779c741b282246d9f3bbb9e0e6ef..e3278d1bf4c92eb973439dafe1178e9f2a3e8107 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavedroid/GameScreen.java
@@ -13,6 +13,8 @@ import ru.deadsoftware.cavedroid.misc.states.AppState;
 import ru.deadsoftware.cavedroid.misc.states.GameState;
 import ru.deadsoftware.cavedroid.misc.states.MenuState;
 
+import javax.annotation.Nullable;
+
 public class GameScreen implements Screen {
 
     public static GameProc GP;
@@ -24,7 +26,7 @@ public class GameScreen implements Screen {
     private Renderer renderer;
     private MenuProc menuProc;
 
-    private InputHandlerGame inputHandlerGame;
+    @Nullable private InputHandlerGame inputHandlerGame;
 
     public GameScreen() {
         Assets.load();
@@ -66,8 +68,7 @@ public class GameScreen implements Screen {
                 break;
 
             case LOAD:
-                GP.resetRenderer();
-                renderer = GP.renderer;
+                renderer = GP.resetRenderer();
                 if (inputHandlerGame == null) {
                     inputHandlerGame = new InputHandlerGame();
                 }
@@ -97,8 +98,7 @@ public class GameScreen implements Screen {
                 renderer = menuProc;
                 break;
             case GAME:
-                GP.resetRenderer();
-                renderer = GP.renderer;
+                renderer = GP.resetRenderer();
                 break;
         }
     }