[Jrisk-cvs] SF.net SVN: domination-code:[2612] Domination

[<yu...@us...>]

Revision: 2612
          http://sourceforge.net/p/domination/code/2612
Author:   yuranet
Date:     2025-01-11 17:42:53 +0000 (Sat, 11 Jan 2025)
Log Message:
-----------
changelog update for release

Modified Paths:
--------------
    Domination/ChangeLog.txt
    Domination/swingUI/src/net/yura/domination/tools/mapeditor/MapEditor.java
    Domination/swingUI/src/net/yura/domination/tools/mapeditor/TegMapLoader.java

Modified: Domination/ChangeLog.txt
===================================================================
--- Domination/ChangeLog.txt	2025-01-11 15:59:50 UTC (rev 2611)
+++ Domination/ChangeLog.txt	2025-01-11 17:42:53 UTC (rev 2612)
@@ -14,11 +14,12 @@
 	Increment1GUI:	2
 	CommandLine:	2
 
-1.3.2
+1.3.2 (11.01.2025) (svn rev 2612)
 
 	music update for menu and winning
 	better loading screens when loading online games and downloading maps
 	GameGUI: in-game can use standard keyboard shortcut to save game
+	GameGUI: main manu - can right click to get to options screen on windows
 	fix out of memory error, Better memory management in audio system, close audio after playing. 
 	fix for handling unexpected errors in audio system to not overload and bring down the maps server
 	RiskGame.getMissions() now returns ALL game missions, to make AI development easier

Modified: Domination/swingUI/src/net/yura/domination/tools/mapeditor/MapEditor.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/tools/mapeditor/MapEditor.java	2025-01-11 15:59:50 UTC (rev 2611)
+++ Domination/swingUI/src/net/yura/domination/tools/mapeditor/MapEditor.java	2025-01-11 17:42:53 UTC (rev 2612)
@@ -534,10 +534,11 @@
 
 			if (name!=null) {
                             if (name.endsWith(".xml")) {
+                                File file = new File(name);
+                                // we load a base map, it HAS to have the same order of countries!
                                 loadMap("teg.map");
-                                File file = new File(name);
                                 TegMapLoader loader = new TegMapLoader();
-                                loader.load( file , myMap , this);
+                                loader.load(file , myMap , this);
                                 myMap.setMapName(null);
                                 myMap.setPreviewPic(null);
                                 fileName = file.getParentFile().getName();

Modified: Domination/swingUI/src/net/yura/domination/tools/mapeditor/TegMapLoader.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/tools/mapeditor/TegMapLoader.java	2025-01-11 15:59:50 UTC (rev 2611)
+++ Domination/swingUI/src/net/yura/domination/tools/mapeditor/TegMapLoader.java	2025-01-11 17:42:53 UTC (rev 2612)
@@ -115,6 +115,10 @@
                         country.setX( continentX+pos_x+  (countryImage.getWidth()/2)  +(armyX/2) );
                         country.setY( continentY+pos_y+  (countryImage.getHeight()/2)  +(armyY/2) );
 
+                        if (country.getContinent() != continent) {
+                            throw new IllegalStateException("continent does not match for " + country + " " +country.getContinent() + "!=" + continent);
+                        }
+                        
                         countryId++;
                     }
                     // read end tag