OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-08 04:27:18 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fixed rare NPE on loading game. Fixed encoding on worldmap.

Browse Source
This commit is contained in:
Zukero
2019-01-03 13:05:54 +01:00
parent a002497ce1
commit cf3a40072f
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndorsTrail/res/values/worldmap_template.xml
View File

@@ -3,7 +3,7 @@
<resources><string name="worldmap_template">"<![CDATA[<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">
<html xmlns=\"http://www.w3.org/1999/xhtml\">
<head>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />
<meta name=\"viewport\" content=\"initial-scale=1.0, minimum-scale=0.02, maximum-scale=5.0\" />
<title></title>
<style type=\"text/css\">

23
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
View File

@@ -2,18 +2,6 @@ package com.gpl.rpg.AndorsTrail.activity;
import java.io.File;
import android.animation.ObjectAnimator;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Button;
import android.widget.Toast;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -25,6 +13,17 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
import com.gpl.rpg.AndorsTrail.util.L;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Button;
import android.widget.Toast;
public final class DisplayWorldMapActivity extends Activity {
private WorldContext world;

16
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
View File

@@ -29,6 +29,8 @@ public final class LoadingActivity extends Activity implements OnResourcesLoaded
private CloudsAnimatorView clouds_back, clouds_mid, clouds_front;
boolean loaded = false;
private Object semaphore = new Object();
@Override
public void onCreate(Bundle savedInstanceState) {
setTheme(ThemeHelper.getBaseTheme());
@@ -73,7 +75,7 @@ public final class LoadingActivity extends Activity implements OnResourcesLoaded
if (progressDialog == null) {
progressDialog = CustomDialogFactory.createDialog(this, getResources().getString(R.string.dialog_loading_message),
getResources().getDrawable(R.drawable.loading_anim), null, null, false, false);
synchronized (progressDialog) {
synchronized (semaphore) {
if (!loaded) {
progressDialog.setOwnerActivity(this);
CustomDialogFactory.show(progressDialog);
@@ -136,13 +138,13 @@ public final class LoadingActivity extends Activity implements OnResourcesLoaded
setup.startCharacterSetup(this);
}
@Override
public void onSceneLoaded() {
if (progressDialog != null) {
synchronized (progressDialog) {
if (progressDialog != null) progressDialog.dismiss();
loaded =true;
}
synchronized (semaphore) {
if (progressDialog != null) progressDialog.dismiss();
loaded =true;
}
startActivity(new Intent(this, MainActivity.class));
this.finish();
@@ -150,7 +152,7 @@ public final class LoadingActivity extends Activity implements OnResourcesLoaded
@Override
public void onSceneLoadFailed(Savegames.LoadSavegameResult loadResult) {
synchronized (progressDialog) {
synchronized (semaphore) {
if (progressDialog != null) progressDialog.dismiss();
loaded =true;
}