Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed HUD errors

Browse Source
This commit is contained in:
Anuken
2018-10-12 12:40:30 -04:00
parent 5feb212df7
commit 2943b6ed04
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -35,7 +35,7 @@ public class HudFragment extends Fragment{
public final BlocksFragment blockfrag = new BlocksFragment(); public final BlocksFragment blockfrag = new BlocksFragment();
private ImageButton menu, flip; private ImageButton menu, flip;
private Table wavetable; private Stack wavetable;
private Table infolabel; private Table infolabel;
private Table lastUnlockTable; private Table lastUnlockTable;
private Table lastUnlockLayout; private Table lastUnlockLayout;
@@ -110,6 +110,8 @@ public class HudFragment extends Fragment{
stack.add(waves); stack.add(waves);
stack.add(btable); stack.add(btable);
wavetable = stack;
addWaveTable(waves); addWaveTable(waves);
addPlayButton(btable); addPlayButton(btable);
cont.add(stack).fillX().height(66f); cont.add(stack).fillX().height(66f);
@@ -127,7 +129,7 @@ public class HudFragment extends Fragment{
if(Net.hasClient()){ if(Net.hasClient()){
t.label(() -> ping.get(Net.getPing())).visible(() -> Net.client() && !gwt).colspan(2); t.label(() -> ping.get(Net.getPing())).visible(() -> Net.client() && !gwt).colspan(2);
} }
}).size(-1).visible(() -> Settings.getBool("fps")).update(t -> t.setTranslation(0, (!waves.isVisible() ? waves.getHeight() : Math.min(waves.getTranslation().y, waves.getHeight())) )).get(); }).size(-1).visible(() -> Settings.getBool("fps")).update(t -> t.setTranslation(0, (!waves.isVisible() ? wavetable.getHeight() : Math.min(wavetable.getTranslation().y, wavetable.getHeight())) )).get();
//make wave box appear below rest of menu //make wave box appear below rest of menu
cont.swapActor(wavetable, menu.getParent()); cont.swapActor(wavetable, menu.getParent());
@@ -344,7 +346,6 @@ public class HudFragment extends Fragment{
} }
private void addWaveTable(TextButton table){ private void addWaveTable(TextButton table){
wavetable = table;
IntFormat wavef = new IntFormat("text.wave"); IntFormat wavef = new IntFormat("text.wave");
IntFormat enemyf = new IntFormat("text.wave.enemy"); IntFormat enemyf = new IntFormat("text.wave.enemy");