crossfire
/
maps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
akirschbaum 2008-11-20 21:58:48 +00:00
parent b6db99ca2b
commit 3f7dd81011
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/scripts/LegacySpellConverter
View File

@ -311,7 +311,7 @@ if (baseDirectory.endsWith("/")) {
baseDirectory = baseDirectory.substring(0, baseDirectory.length() - 1); baseDirectory = baseDirectory.substring(0, baseDirectory.length() - 1);
} }
String mapDefaultFolder = globalSettings.getMapDefaultFolder(); String mapDefaultFolder = globalSettings.getMapsDirectory().getPath();
String rootDirectory = mapDefaultFolder + baseDirectory; String rootDirectory = mapDefaultFolder + baseDirectory;
Iterator it = new RecursiveFileIterator(new File(rootDirectory)); Iterator it = new RecursiveFileIterator(new File(rootDirectory));
while (it.hasNext()) { while (it.hasNext()) {

2
editor/scripts/MapNormalizer
View File

@ -45,7 +45,7 @@ if (baseDirectory.endsWith("/")) {
baseDirectory = baseDirectory.substring(0, baseDirectory.length() - 1); baseDirectory = baseDirectory.substring(0, baseDirectory.length() - 1);
} }
String mapDefaultFolder = globalSettings.getMapDefaultFolder(); String mapDefaultFolder = globalSettings.getMapsDirectory().getPath();
String rootDirectory = mapDefaultFolder + baseDirectory; String rootDirectory = mapDefaultFolder + baseDirectory;
Iterator it = new RecursiveFileIterator(new File(rootDirectory)); Iterator it = new RecursiveFileIterator(new File(rootDirectory));
while (it.hasNext()) { while (it.hasNext()) {

7
editor/scripts/MapValidator
View File

@ -58,8 +58,9 @@ void checkMap(File mapFile, String mapPath) {
sb.append(validationError); sb.append(validationError);
GameObject gameObject = validationError.getGameObject(); Iterator it2 = validationError.getGameObjects().iterator();
if (gameObject != null) { while (it2.hasNext()) {
GameObject gameObject = it2.next();
sb.append(" [").append(gameObject.getBestName()).append(']'); sb.append(" [").append(gameObject.getBestName()).append(']');
} }
@ -87,7 +88,7 @@ try {
baseDirectory = baseDirectory.substring(0, baseDirectory.length() - 1); baseDirectory = baseDirectory.substring(0, baseDirectory.length() - 1);
} }
String mapDefaultFolder = globalSettings.getMapDefaultFolder(); String mapDefaultFolder = globalSettings.getMapsDirectory().getPath();
String rootDirectory = mapDefaultFolder + baseDirectory; String rootDirectory = mapDefaultFolder + baseDirectory;
Iterator it = new RecursiveFileIterator(new File(rootDirectory)); Iterator it = new RecursiveFileIterator(new File(rootDirectory));
while (it.hasNext()) { while (it.hasNext()) {

2
editor/scripts/WorldMaker
View File

@ -72,7 +72,7 @@ void checkDaList() {
DestHeight = TileHeight.intValue() * NumY.intValue(); DestHeight = TileHeight.intValue() * NumY.intValue();
if (Location == null || Location.length() < 1) { if (Location == null || Location.length() < 1) {
Location = globalSettings.getMapDefaultFolder(); Location = globalSettings.getMapsDirectory().getPath();
print("autodetected location " + Location); print("autodetected location " + Location);
} }