-- Removing Credits screen (broken aesthetic Issue:4) Adding window L…

…ogo (Issue:5)
Torbuntu · Nov 6, 2019 · 18697f6 · 18697f6
1 parent f62239d
commit 18697f6
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 108 deletions.
diff --git a/assets/Data/Logo/Logo.png b/assets/Data/Logo/Logo.png
diff --git a/core/src/main/java/leikr/GameRuntime.java b/core/src/main/java/leikr/GameRuntime.java
@@ -18,7 +18,6 @@
 import leikr.customProperties.CustomSystemProperties;
 import leikr.screens.EngineScreen;
 import leikr.loaders.FontLoader;
-import leikr.screens.CreditScreen;
 import leikr.screens.ErrorScreen;
 import leikr.screens.LoadScreen;
 import leikr.screens.NewProgramScreen;
@@ -108,11 +107,10 @@ public void initialise() {
 
         this.addScreen(new EngineScreen());//1
         this.addScreen(new TitleScreen(assetManager));//2
-        this.addScreen(new CreditScreen(assetManager));//3
-        this.addScreen(new ErrorScreen(assetManager));//4
-        this.addScreen(new LoadScreen());//5
-        this.addScreen(new NewProgramScreen());//6
-        this.addScreen(new TerminalScreen());//7
+        this.addScreen(new ErrorScreen(assetManager));//3
+        this.addScreen(new LoadScreen());//4
+        this.addScreen(new NewProgramScreen());//5
+        this.addScreen(new TerminalScreen());//6
     }
 
     @Override

diff --git a/core/src/main/java/leikr/screens/CreditScreen.java b/core/src/main/java/leikr/screens/CreditScreen.java
diff --git a/core/src/main/java/leikr/screens/ErrorScreen.java b/core/src/main/java/leikr/screens/ErrorScreen.java
@@ -34,7 +34,7 @@
  */
 public class ErrorScreen extends BasicGameScreen {
 
-    public static int ID = 4;
+    public static int ID = 3;
     AssetManager assetManager;
     FitViewport viewport;
     boolean MENU = false;

diff --git a/core/src/main/java/leikr/screens/LoadScreen.java b/core/src/main/java/leikr/screens/LoadScreen.java
@@ -39,7 +39,7 @@
  */
 public class LoadScreen extends BasicGameScreen {
 
-    public static int ID = 5;
+    public static int ID = 4;
 
     FitViewport viewport;
     ExecutorService service;

diff --git a/core/src/main/java/leikr/screens/NewProgramScreen.java b/core/src/main/java/leikr/screens/NewProgramScreen.java
@@ -38,7 +38,7 @@
  */
 public class NewProgramScreen extends BasicGameScreen {
 
-    public static int ID = 6;
+    public static int ID = 5;
     FitViewport viewport;
 
     boolean BACK = false;

diff --git a/core/src/main/java/leikr/screens/TerminalScreen.java b/core/src/main/java/leikr/screens/TerminalScreen.java
@@ -41,7 +41,7 @@
  */
 public class TerminalScreen extends BasicGameScreen implements InputProcessor {
 
-    public static int ID = 7;
+    public static int ID = 6;
 
     boolean RUN_PROGRAM = false;
     boolean NEW_PROGRAM = false;

diff --git a/core/src/main/java/leikr/screens/TitleScreen.java b/core/src/main/java/leikr/screens/TitleScreen.java
@@ -52,7 +52,7 @@ public TitleScreen(AssetManager assetManager) {
     void checkInput(ScreenManager sm) {
         if (Mdx.input.isKeyJustPressed(Keys.SPACE) || Mdx.input.isKeyJustPressed(Keys.ENTER) || CREDITS) {
             CREDITS = false;
-            sm.enterGameScreen(CreditScreen.ID, null, null);
+            sm.enterGameScreen(TerminalScreen.ID, null, null);
         }
         if (Mdx.input.isKeyJustPressed(Keys.ESCAPE)) {
             System.out.println("Goodbye!");

diff --git a/desktop/src/leikr/desktop/DesktopLauncher.java b/desktop/src/leikr/desktop/DesktopLauncher.java
@@ -15,6 +15,7 @@
  */
 package leikr.desktop;
 
+import com.badlogic.gdx.Files;
 import com.badlogic.gdx.backends.lwjgl.DesktopMini2DxGame;
 import java.io.File;
 import java.security.Security;
@@ -41,6 +42,8 @@ public static void main(String[] arg) {
         config.width = 720;
         config.height = 480;
         config.fullscreen = false;
+        config.addIcon("Data/Logo/Logo.png", Files.FileType.Internal);
+
         new DesktopMini2DxGame(new GameRuntime(arg), config);
     }
 }