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

Fix marker and bridge calculation game crashes, minor marker instruction fixes (#9112)

Browse Source 
* Fix text setting in marker control

* Fix marker and bridge calculation game crashes, minor marker instruction code fixes
This commit is contained in:
ApsZoldat
2023-09-29 17:10:50 +03:00
committed by GitHub
parent 8b155828b7
commit 93269692ab
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/mindustry/game/MapObjectives.java
View File

@@ -32,7 +32,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
public static final Seq<Prov<? extends MapObjective>> allObjectiveTypes = new Seq<>();
public static final Seq<Prov<? extends ObjectiveMarker>> allMarkerTypes = new Seq<>();
public static final ObjectMap<String, Prov<? extends ObjectiveMarker>> markerNameToType = new ObjectMap<>();
public static final Seq<String> allMarkerTypeNanes = new Seq<>();
public static final Seq<String> allMarkerTypeNames = new Seq<>();
/**
* All objectives the executor contains. Do not modify directly, ever!
@@ -87,7 +87,7 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
Class<? extends ObjectiveMarker> type = prov.get().getClass();
String name = type.getSimpleName().replace("Marker", "");
allMarkerTypeNanes.add(Strings.camelize(name));
allMarkerTypeNames.add(Strings.camelize(name));
markerNameToType.put(name, prov);
markerNameToType.put(Strings.camelize(name), prov);
JsonIO.classTag(Strings.camelize(name), type);
@@ -707,6 +707,9 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
fetchedText = fetchText(text);
}
// font size cannot be 0
if(Math.abs(fontSize) < 1e-5) return;
WorldLabel.drawAt(fetchedText, pos.x, pos.y + radius + textHeight, Draw.z(), flags, fontSize);
}
@@ -898,7 +901,8 @@ public class MapObjectives implements Iterable<MapObjective>, Eachable<MapObject
@Override
public void draw(){
if(hidden) return;
// font size cannot be 0
if(hidden || Math.abs(fontSize) < 1e-5) return;
if(fetchedText == null){
fetchedText = fetchText(text);