From 90b9ba71de0dc8052823c464db6487c8522ed96d Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 11 May 2018 07:02:10 -0700 Subject: [PATCH] Removed delta() usage in modules --- core/src/io/anuke/mindustry/core/Control.java | 2 +- core/src/io/anuke/mindustry/core/Logic.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index ceb98e2042..e0e977a321 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -345,7 +345,7 @@ public class Control extends Module{ if(respawntime > 0){ - respawntime -= delta(); + respawntime -= Timers.delta(); if(respawntime <= 0){ player.set(world.getSpawnX(), world.getSpawnY()); diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index 0ae214dad5..c8c20235e7 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/core/src/io/anuke/mindustry/core/Logic.java @@ -17,6 +17,8 @@ import io.anuke.ucore.entities.Entities; import io.anuke.ucore.entities.EntityGroup; import io.anuke.ucore.modules.Module; +import java.sql.Time; + import static io.anuke.mindustry.Vars.*; /**Logic module. @@ -27,6 +29,7 @@ import static io.anuke.mindustry.Vars.*; * This class should not call any outside methods to change state of modules, but instead fire events. */ public class Logic extends Module { + public boolean doUpdate = true; public Logic(){ state = new GameState(); @@ -80,6 +83,7 @@ public class Logic extends Module { @Override public void update(){ + if(!doUpdate) return; if(!state.is(State.menu)){ @@ -109,9 +113,9 @@ public class Logic extends Module { if(!state.mode.disableWaveTimer){ if(state.enemies <= 0){ - if(!world.getMap().name.equals("tutorial")) state.wavetime -= delta(); + if(!world.getMap().name.equals("tutorial")) state.wavetime -= Timers.delta(); }else{ - state.extrawavetime -= delta(); + state.extrawavetime -= Timers.delta(); } }