From 356cd2c908b1b65f6e21f393187f22d927bcd2aa Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Tue, 14 Mar 2023 18:53:18 +0800 Subject: [PATCH 1/2] fix old theme splashscreen and logo - themes without hd skins should load fine now --- forge-gui-mobile/src/forge/assets/FSkin.java | 4 ++-- forge-gui-mobile/src/forge/assets/FSkinTexture.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java index 1c6990e53d4..8f5ff88bbdd 100644 --- a/forge-gui-mobile/src/forge/assets/FSkin.java +++ b/forge-gui-mobile/src/forge/assets/FSkin.java @@ -35,7 +35,7 @@ public class FSkin { public static Texture getLogo() { if (Forge.isMobileAdventureMode) return Forge.getAssets().getTexture(getDefaultSkinFile("adv_logo.png")); - return Forge.getAssets().getTexture(getSkinFile("hd_logo.png")); + return Forge.getAssets().getTexture(getSkinFile("hd_logo.png"), false); } public static void changeSkin(final String skinName) { @@ -150,7 +150,7 @@ public class FSkin { Forge.getAssets().loadTexture(f2); splashScreen.setSplashTexture(new TextureRegion(Forge.getAssets().getTexture(f2))); } else { - splashScreen.setSplashTexture(new TextureRegion(Forge.getAssets().getTexture(f2), 0, 0, w, h - 100)); + splashScreen.setSplashTexture(new TextureRegion(Forge.getAssets().getTexture(f), 0, 0, w, h - 100)); } } Pixmap pxSplash = new Pixmap(f); diff --git a/forge-gui-mobile/src/forge/assets/FSkinTexture.java b/forge-gui-mobile/src/forge/assets/FSkinTexture.java index c9a9ec9c39f..2c74463286c 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinTexture.java +++ b/forge-gui-mobile/src/forge/assets/FSkinTexture.java @@ -202,7 +202,7 @@ public enum FSkinTexture implements FImage { FileHandle preferredFile = isPlanechaseBG ? FSkin.getCachePlanechaseFile(filename) : FSkin.getSkinFile(filename); if (preferredFile.exists()) { try { - texture = Forge.getAssets().getTexture(preferredFile); + texture = Forge.getAssets().getTexture(preferredFile, false); isloaded = true; } catch (final Exception e) { From 9d9103709d26affa3b850c692040289a933c6863 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Tue, 14 Mar 2023 19:02:09 +0800 Subject: [PATCH 2/2] update check --- forge-gui-mobile/src/forge/assets/FSkinTexture.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/forge-gui-mobile/src/forge/assets/FSkinTexture.java b/forge-gui-mobile/src/forge/assets/FSkinTexture.java index 2c74463286c..aacdf772f0e 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinTexture.java +++ b/forge-gui-mobile/src/forge/assets/FSkinTexture.java @@ -203,7 +203,8 @@ public enum FSkinTexture implements FImage { if (preferredFile.exists()) { try { texture = Forge.getAssets().getTexture(preferredFile, false); - isloaded = true; + if (texture != null) + isloaded = true; } catch (final Exception e) { System.err.println("Failed to load skin file: " + preferredFile); @@ -242,7 +243,8 @@ public enum FSkinTexture implements FImage { } } if (repeat) { - texture.setWrap(TextureWrap.Repeat, TextureWrap.Repeat); + if (texture != null) + texture.setWrap(TextureWrap.Repeat, TextureWrap.Repeat); } }