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

Use correct previousPosition when moving monsters.

Browse Source
This commit is contained in:
Oskar Wiksten
2013-01-13 00:18:36 +01:00
parent 5d437db461
commit 6a59f5d99e
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AndorsTrail/src/com/gpl/rpg/AndorsTrail/Savegames.java
View File

@@ -55,10 +55,10 @@ public final class Savegames {
return false;
}
}
public static int loadWorld(WorldContext world, Context androidContext, int slot) {
public static int loadWorld(WorldContext world, ViewContext view, Context androidContext, int slot) {
try {
FileInputStream fos = getInputFile(androidContext, slot);
int result = loadWorld(world, fos);
int result = loadWorld(world, view, fos);
fos.close();
return result;
} catch (IOException e) {
@@ -112,12 +112,11 @@ public final class Savegames {
dest.close();
}
public static int loadWorld(WorldContext world, InputStream inState) throws IOException {
public static int loadWorld(WorldContext world, ViewContext view, InputStream inState) throws IOException {
DataInputStream src = new DataInputStream(inState);
final FileHeader header = new FileHeader(src);
if (header.fileversion > AndorsTrailApplication.CURRENT_VERSION) return LOAD_RESULT_FUTURE_VERSION;
ViewContext view = new ViewContext(null, world);
world.maps.readFromParcel(src, world, view, header.fileversion);
world.model = new ModelContainer(src, world, view, header.fileversion);
src.close();

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
View File

@@ -139,7 +139,7 @@ public final class WorldSetup {
private int continueWorld() {
Context ctx = androidContext.get();
int result = Savegames.loadWorld(world, ctx, loadFromSlot);
int result = Savegames.loadWorld(world, view, ctx, loadFromSlot);
if (result == Savegames.LOAD_RESULT_SUCCESS) {
MovementController.cacheCurrentMapData(ctx.getResources(), world, world.model.currentMap);
}

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
View File

@@ -91,7 +91,7 @@ public final class MonsterMovementController {
monsterMovementListeners.onMonsterSteppedOnPlayer(m);
view.combatController.monsterSteppedOnPlayer(m);
} else {
CoordRect previousPosition = new CoordRect(m.position, m.rectPosition.size);
CoordRect previousPosition = new CoordRect(new Coord(m.position), m.rectPosition.size);
m.position.set(m.nextPosition.topLeft);
monsterMovementListeners.onMonsterMoved(m, previousPosition);
}