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

Merge branch 'master' into 'master'

Browse Source 
Revert path for Android

See merge request core-developers/forge!6371
This commit is contained in:
Anthony Calosa
2022-03-08 10:04:37 +00:00
parent 4634bdf50a 9b543986f1
commit 39c456c204
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-mobile/src/forge/Forge.java
View File

@@ -339,7 +339,7 @@ public class Forge implements ApplicationListener {
protected void afterDbLoaded() { protected void afterDbLoaded() {
//init here to fix crash if the assets are missing //init here to fix crash if the assets are missing
transitionTexture = new Texture(Gdx.files.classpath("fallback_skin").child("transition.png")); transitionTexture = new Texture(GuiBase.isAndroid() ? Gdx.files.internal("fallback_skin").child("transition.png") : Gdx.files.classpath("fallback_skin").child("transition.png"));
destroyThis = false; //Allow back() destroyThis = false; //Allow back()

2
forge-gui-mobile/src/forge/assets/FSkin.java
View File

@@ -108,7 +108,7 @@ public class FSkin {
{ {
if (!dir.exists() || !dir.isDirectory()) { if (!dir.exists() || !dir.isDirectory()) {
//if skins directory doesn't exist, point to internal assets/skin directory instead for the sake of the splash screen //if skins directory doesn't exist, point to internal assets/skin directory instead for the sake of the splash screen
preferredDir = Gdx.files.classpath("fallback_skin"); preferredDir = GuiBase.isAndroid() ? Gdx.files.internal("fallback_skin") : Gdx.files.classpath("fallback_skin");
} }
else { else {
if (splashScreen != null) { if (splashScreen != null) {

4
forge-gui-mobile/src/forge/screens/SplashScreen.java
View File

@@ -97,7 +97,9 @@ public class SplashScreen extends FContainer {
private float progress = 0; private float progress = 0;
private boolean finished, openAdventure; private boolean finished, openAdventure;
//for transition image only... //for transition image only...
TextureRegion transition_bg = new TextureRegion(new Texture(Gdx.files.classpath("fallback_skin").child("title_bg_lq.png"))); TextureRegion transition_bg = new TextureRegion(new Texture(GuiBase.isAndroid()
? Gdx.files.internal("fallback_skin").child("title_bg_lq.png")
: Gdx.files.classpath("fallback_skin").child("title_bg_lq.png")));
public void drawBackground(Graphics g) { public void drawBackground(Graphics g) {
float percentage = progress / DURATION; float percentage = progress / DURATION;