From 5573d571bcd6184615222ddb25cb3383f81a4986 Mon Sep 17 00:00:00 2001
From: Tobydrama <Tobe-madsen@hotmail.no>
Date: Thu, 2 Apr 2020 12:48:28 +0200
Subject: [PATCH] endret timerenen og la til show funksjon

---
 .../fiasko/roborally/game_wrapper/LoadingScreen.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/inf112/fiasko/roborally/game_wrapper/LoadingScreen.java b/src/main/java/inf112/fiasko/roborally/game_wrapper/LoadingScreen.java
index b2fa4e7..e2160c2 100644
--- a/src/main/java/inf112/fiasko/roborally/game_wrapper/LoadingScreen.java
+++ b/src/main/java/inf112/fiasko/roborally/game_wrapper/LoadingScreen.java
@@ -38,9 +38,8 @@ public class LoadingScreen extends AbstractScreen {
                 applicationHeight/2f,380, 1, true);
         roboRallyWrapper.batch.end();
         long time = System.currentTimeMillis();
-        if (time-startTime>10000){
-            roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getMainMenuScreen(this.roboRallyWrapper));
-            dispose();
+        if (time-startTime>5000){
+            roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getStartMenuScreen(this.roboRallyWrapper));
         }
     }
 
@@ -49,4 +48,9 @@ public class LoadingScreen extends AbstractScreen {
         viewport.update(width, height);
     }
 
+    @Override
+    public void show(){
+        startTime = System.currentTimeMillis();
+    }
+
 }