OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-23 20:05:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'permadeath' into nut_arulir_mountain

Browse Source 
# Conflicts:
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
This commit is contained in:
Gonk
2019-12-20 15:20:02 +01:00
parent 7d133b2d1c c9c4c6377e
commit cfa2640e6a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java
View File

@@ -184,7 +184,7 @@ public final class GameStatistics {
}
this.spentGold = src.readInt();
if (fileversion < 48) return;
if (fileversion < 49) return;
this.startLives = src.readInt();
this.unlimitedSaves = src.readBoolean();

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
View File

@@ -369,7 +369,7 @@ public final class Player extends Actor {
}
}
if (fileversion >= 48) {
if (fileversion >= 49) {
this.id = src.readUTF();
this.savedVersion = src.readLong();
}

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
View File

@@ -349,7 +349,7 @@ public final class Savegames {
this.iconID = TileManager.CHAR_HERO_0;
}
if (fileversion >= 48) {
if (fileversion >= 49) {
this.isDead = src.readBoolean();
this.hasUnlimitedSaves = src.readBoolean();
this.playerId = src.readUTF();