external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3051 from kevlahnota/newmaster2

Browse Source 
fix blackscreen
This commit is contained in:
Anthony Calosa
2023-05-02 15:31:18 +08:00
committed by GitHub
parent 999292a8ba 1f721c0002
commit 0427c9af71
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui-mobile/src/forge/adventure/stage/MapSprite.java
View File

@@ -1,6 +1,7 @@
package forge.adventure.stage; package forge.adventure.stage;
import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.Sprite;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.Actor;
@@ -56,8 +57,11 @@ public class MapSprite extends Actor {
BiomeSpriteData data = WorldSave.getCurrentSave().getWorld().getObject(entry.getValue()); BiomeSpriteData data = WorldSave.getCurrentSave().getWorld().getObject(entry.getValue());
if (data.layer != layer) if (data.layer != layer)
continue; continue;
Actor sprite = new MapSprite(entry.getKey(), WorldSave.getCurrentSave().getWorld().getData().GetBiomeSprites().getSprite(data.name, (int) entry.getKey().x + (int) entry.getKey().y * 11483), null); Sprite biomeSprite = WorldSave.getCurrentSave().getWorld().getData().GetBiomeSprites().getSprite(data.name, (int) entry.getKey().x + (int) entry.getKey().y * 11483);
actorGroup.add(sprite); if (biomeSprite != null) { //null means invalid and will cause blackscreen, investigate why this would happen...
Actor sprite = new MapSprite(entry.getKey(), biomeSprite, null);
actorGroup.add(sprite);
}
} }
return actorGroup; return actorGroup;
} }

7
forge-gui-mobile/src/forge/adventure/world/BiomeSprites.java
View File

@@ -28,7 +28,12 @@ public class BiomeSprites {
if (sprites.isEmpty()) { if (sprites.isEmpty()) {
sprites.addAll(textureAtlasBuffer.createSprites(name)); sprites.addAll(textureAtlasBuffer.createSprites(name));
} }
return sprites.get(seed % sprites.size); int index = seed % sprites.size;
if (index >= sprites.size || index < 0) {
System.err.println("Invalid index: " + index + " [" + name + "]");
return null;
}
return sprites.get(index);
} }
public BiomeSpriteData getSpriteData(String name) { public BiomeSpriteData getSpriteData(String name) {