diff --git a/install/open-ig-0.95.259.jar b/install/open-ig-0.95.259.jar new file mode 100644 index 00000000..bbb81f9b Binary files /dev/null and b/install/open-ig-0.95.259.jar differ diff --git a/src/hu/openig/model/Configuration.java b/src/hu/openig/model/Configuration.java index 591da414..c125c7c4 100644 --- a/src/hu/openig/model/Configuration.java +++ b/src/hu/openig/model/Configuration.java @@ -35,7 +35,7 @@ */ public class Configuration { /** The version string. */ - public static final String VERSION = "0.95.258"; + public static final String VERSION = "0.95.259"; /** Annotation for indicating load/save a field. */ @Retention(RetentionPolicy.RUNTIME) @interface LoadSave { } diff --git a/src/hu/openig/model/World.java b/src/hu/openig/model/World.java index 0abdede2..fa2ba5c1 100644 --- a/src/hu/openig/model/World.java +++ b/src/hu/openig/model/World.java @@ -3398,6 +3398,8 @@ void prepareLayout() { List features = ps.features; Map map = ps.basemap; + Set xclude = ps.deploymentExclusions; + ps.deploymentExclusions = new HashSet<>(); ps.basemap = new HashMap<>(map.size() * pscale * pscale); ps.features = new ArrayList<>(features.size() * pscale * pscale); @@ -3466,7 +3468,13 @@ void prepareLayout() { ps.surfaceCells.initEmptySurface(loc3.x, loc3.y); } } + } + for (Location locx : xclude) { + int x2 = locx.x + i * w0 - j * h0; + int y2 = locx.y - i * w0 - j * h0; + Location loc2x = Location.of(x2, y2); + ps.deploymentExclusions.add(loc2x); } } } diff --git a/src/hu/openig/screen/items/GameOverScreen.java b/src/hu/openig/screen/items/GameOverScreen.java index acec6294..6dd553fc 100644 --- a/src/hu/openig/screen/items/GameOverScreen.java +++ b/src/hu/openig/screen/items/GameOverScreen.java @@ -72,6 +72,7 @@ public void invoke() { hideSecondary(); commons.control().displayStatusbar(); commons.nongame = false; + commons.playMusic(); } }; loadButton = new UIGenericButton(get("win.load"), fontMetrics(16), commons.common().mediumButton, commons.common().mediumButtonPressed); diff --git a/update.xml b/update.xml index 57c01325..af16634e 100644 --- a/update.xml +++ b/update.xml @@ -23,7 +23,7 @@ The launcher's main file - + Az Open Imperium Galactica játék. @@ -42,6 +42,10 @@ Bugfixes + + Play music again after finishing the main campaign and selecting continue. + Fix deployment exclusion locations not scaling with the planet in skirmish. + Fix a crash when using planet scaling settings. @@ -340,7 +344,7 @@ Fixed AI unable to build a power plant if the missing energy was above the capacity of available power plant types. - +