mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-15 12:24:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Removed delta() usage in modules

Browse Source
This commit is contained in:
Anuken 2018-05-11 07:02:10 -07:00
parent cce35b4a6f
commit 90b9ba71de
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/core/Control.java
View File

@ -345,7 +345,7 @@ public class Control extends Module{
if(respawntime > 0){ if(respawntime > 0){
respawntime -= delta(); respawntime -= Timers.delta();
if(respawntime <= 0){ if(respawntime <= 0){
player.set(world.getSpawnX(), world.getSpawnY()); player.set(world.getSpawnX(), world.getSpawnY());

8
core/src/io/anuke/mindustry/core/Logic.java
View File

@ -17,6 +17,8 @@ import io.anuke.ucore.entities.Entities;
import io.anuke.ucore.entities.EntityGroup; import io.anuke.ucore.entities.EntityGroup;
import io.anuke.ucore.modules.Module; import io.anuke.ucore.modules.Module;
import java.sql.Time;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
/**Logic module. /**Logic module.
@ -27,6 +29,7 @@ import static io.anuke.mindustry.Vars.*;
* This class should <i>not</i> call any outside methods to change state of modules, but instead fire events. * This class should <i>not</i> call any outside methods to change state of modules, but instead fire events.
*/ */
public class Logic extends Module { public class Logic extends Module {
public boolean doUpdate = true;
public Logic(){ public Logic(){
state = new GameState(); state = new GameState();
@ -80,6 +83,7 @@ public class Logic extends Module {
@Override @Override
public void update(){ public void update(){
if(!doUpdate) return;
if(!state.is(State.menu)){ if(!state.is(State.menu)){
@ -109,9 +113,9 @@ public class Logic extends Module {
if(!state.mode.disableWaveTimer){ if(!state.mode.disableWaveTimer){
if(state.enemies <= 0){ if(state.enemies <= 0){
if(!world.getMap().name.equals("tutorial")) state.wavetime -= delta(); if(!world.getMap().name.equals("tutorial")) state.wavetime -= Timers.delta();
}else{ }else{
state.extrawavetime -= delta(); state.extrawavetime -= Timers.delta();
} }
} }