From 051d1e56a78ca67b8f274c9ffb7946b8d3d44aab Mon Sep 17 00:00:00 2001
From: Pan <Pan@192.168.1.11>
Date: Tue, 21 May 2019 08:22:30 +1200
Subject: [PATCH] h

---
 core/AssetManager.java |  1 -
 core/mainThread.java   | 14 ++++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/core/AssetManager.java b/core/AssetManager.java
index 45c682f..2ccf696 100644
--- a/core/AssetManager.java
+++ b/core/AssetManager.java
@@ -318,7 +318,6 @@ public class AssetManager {
 		rockets = null;
 		
 		mainThread.gridMap.reset();
-		mainThread.totalGameTime = 0;
 		solidObject.globalUniqID = 0;
 		
 		postProcessingThread.reset();
diff --git a/core/mainThread.java b/core/mainThread.java
index 7534ae0..f73bfbf 100644
--- a/core/mainThread.java
+++ b/core/mainThread.java
@@ -26,7 +26,7 @@ public class mainThread extends JFrame implements KeyListener, ActionListener, M
 	public static int frameInterval;
 	public static int frameIndex;
 	public static int gameFrame;
-	public static long lastDraw, lastFrameTime, frameTime, totalGameTime;
+	public static long lastDraw;
 	public static long delta;
 	public static int sleepTime;
 	public static int framePerSecond, cpuUsage;
@@ -251,9 +251,8 @@ public class mainThread extends JFrame implements KeyListener, ActionListener, M
 		if(!gamePaused) {
 			if(gameStarted)
 				gameFrame++;
-			if(gameFrame > 0)
-				totalGameTime+=frameTime;
-			timeString = secondsToString((int)(totalGameTime/1000000000));
+			
+			timeString = secondsToString((int)(gameFrame*0.025));
 			
 			//handle user's interaction with game GUI
 			if(gameFrame == 1 && gameStarted){
@@ -597,19 +596,15 @@ public class mainThread extends JFrame implements KeyListener, ActionListener, M
 		//}
 
 		long currentTime = System.nanoTime();
-		
-		frameTime = currentTime - lastFrameTime;
 		try {
 			long timeSpent = currentTime - lastDraw;
 			
-			
 			int sleeptime = (int)(frameInterval - timeSpent/1000000);
 			
 			
 			if(delta >= 1000000) {
-				sleeptime-=1;
+				sleeptime--;
 				delta-=1000000;
-				
 			}
 			
 			if(sleeptime > 0)
@@ -636,7 +631,6 @@ public class mainThread extends JFrame implements KeyListener, ActionListener, M
 		
 		
 		lastDraw=System.nanoTime();
-		lastFrameTime= currentTime;
 	}
 	
 	public static String secondsToString(int pTime) {