From 3f7dd8101119b6430480f0ffcb53d81baa7fdfd6 Mon Sep 17 00:00:00 2001
From: akirschbaum <akirschbaum@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Thu, 20 Nov 2008 21:58:48 +0000
Subject: [PATCH] Make editor scripts work with latest Gridarta.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10625 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 editor/scripts/LegacySpellConverter | 2 +-
 editor/scripts/MapNormalizer        | 2 +-
 editor/scripts/MapValidator         | 7 ++++---
 editor/scripts/WorldMaker           | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/editor/scripts/LegacySpellConverter b/editor/scripts/LegacySpellConverter
index 9dbd5e139..30ad012f1 100644
--- a/editor/scripts/LegacySpellConverter
+++ b/editor/scripts/LegacySpellConverter
@@ -311,7 +311,7 @@ if (baseDirectory.endsWith("/")) {
     baseDirectory = baseDirectory.substring(0, baseDirectory.length() - 1);
 }
 
-String mapDefaultFolder = globalSettings.getMapDefaultFolder();
+String mapDefaultFolder = globalSettings.getMapsDirectory().getPath();
 String rootDirectory = mapDefaultFolder + baseDirectory;
 Iterator it = new RecursiveFileIterator(new File(rootDirectory));
 while (it.hasNext()) {
diff --git a/editor/scripts/MapNormalizer b/editor/scripts/MapNormalizer
index fd8a18250..fed29aa11 100644
--- a/editor/scripts/MapNormalizer
+++ b/editor/scripts/MapNormalizer
@@ -45,7 +45,7 @@ if (baseDirectory.endsWith("/")) {
     baseDirectory = baseDirectory.substring(0, baseDirectory.length() - 1);
 }
 
-String mapDefaultFolder = globalSettings.getMapDefaultFolder();
+String mapDefaultFolder = globalSettings.getMapsDirectory().getPath();
 String rootDirectory = mapDefaultFolder + baseDirectory;
 Iterator it = new RecursiveFileIterator(new File(rootDirectory));
 while (it.hasNext()) {
diff --git a/editor/scripts/MapValidator b/editor/scripts/MapValidator
index 766a28727..d4927daab 100644
--- a/editor/scripts/MapValidator
+++ b/editor/scripts/MapValidator
@@ -58,8 +58,9 @@ void checkMap(File mapFile, String mapPath) {
 
         sb.append(validationError);
 
-        GameObject gameObject = validationError.getGameObject();
-        if (gameObject != null) {
+        Iterator it2 = validationError.getGameObjects().iterator();
+        while (it2.hasNext()) {
+            GameObject gameObject = it2.next();
             sb.append(" [").append(gameObject.getBestName()).append(']');
         }
 
@@ -87,7 +88,7 @@ try {
         baseDirectory = baseDirectory.substring(0, baseDirectory.length() - 1);
     }
 
-    String mapDefaultFolder = globalSettings.getMapDefaultFolder();
+    String mapDefaultFolder = globalSettings.getMapsDirectory().getPath();
     String rootDirectory = mapDefaultFolder + baseDirectory;
     Iterator it = new RecursiveFileIterator(new File(rootDirectory));
     while (it.hasNext()) {
diff --git a/editor/scripts/WorldMaker b/editor/scripts/WorldMaker
index 36d3d212b..28549d605 100644
--- a/editor/scripts/WorldMaker
+++ b/editor/scripts/WorldMaker
@@ -72,7 +72,7 @@ void checkDaList() {
     DestHeight = TileHeight.intValue() * NumY.intValue();
 
     if (Location == null || Location.length() < 1) {
-        Location = globalSettings.getMapDefaultFolder();
+        Location = globalSettings.getMapsDirectory().getPath();
         print("autodetected location " + Location);
     }