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

Refactor: Flatten some forward-arrow-pattern ifs to vertical code

Browse Source
This commit is contained in:
Oskar Wiksten
2013-10-27 15:29:27 +01:00
parent 4209f91d00
commit a2caea0a83
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ public final class MapCollection {
}
}
private static boolean shouldSaveMap(WorldContext world, PredefinedMap map) {
public static boolean shouldSaveMap(WorldContext world, PredefinedMap map) {
if (map.visited) return true;
if (map.shouldSaveMapData(world)) return true;
return false;

19
AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
View File

@@ -71,7 +71,9 @@ public final class PredefinedMap {
public MapObject findEventObject(MapObject.MapObjectType objectType, String name) {
for (MapObject o : eventObjects) {
if (!o.isActive) continue;
if (o.type == objectType && name.equals(o.id)) return o;
if (o.type != objectType) continue;
if (!name.equals(o.id)) continue;
return o;
}
return null;
}
@@ -79,21 +81,18 @@ public final class PredefinedMap {
List<MapObject> result = null;
for (MapObject o : eventObjects) {
if (!o.isActive) continue;
if (o.position.contains(p)) {
if (result == null) result = new ArrayList<MapObject>();
result.add(o);
}
if (!o.position.contains(p)) continue;
if (result == null) result = new ArrayList<MapObject>();
result.add(o);
}
return result;
}
public boolean hasContainerAt(final Coord p) {
for (MapObject o : eventObjects) {
if (!o.isActive) continue;
if (o.type == MapObject.MapObjectType.container) {
if (o.position.contains(p)) {
return true;
}
}
if (o.type != MapObject.MapObjectType.container) continue;
if (!o.position.contains(p)) continue;
return true;
}
return false;
}