github/JavaRTS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/phu004/JavaRTS.git

Browse Source 
Conflicts:
	core/mainThread.java
This commit is contained in:
Pan 2019-02-25 14:08:35 +13:00
commit cabd62931a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/mainThread.java
View File

@ -492,8 +492,13 @@ public class mainThread extends JFrame implements KeyListener, ActionListener, M
framePerSecond = (int)(1000/((thisTime - lastTime)/30)); framePerSecond = (int)(1000/((thisTime - lastTime)/30));
lastTime = thisTime; lastTime = thisTime;
} }
<<<<<<< HEAD
sleepTime = 0; sleepTime = 0;
while(System.currentTimeMillis()-lastDraw<frameInterval){ while(System.currentTimeMillis()-lastDraw<frameInterval){
=======
sleepTime = 0;
/*while(System.currentTimeMillis()-lastDraw<frameInterval){
>>>>>>> branch 'master' of https://github.com/phu004/JavaRTS.git
try { try {
Thread.sleep(1); Thread.sleep(1);
sleepTime++; sleepTime++;