Merge branch 'master' of https://github.com/bladecoder/bladecoder-adventure-engine

Author: bladecoder

adventure-composer/src/main/java/com/bladecoder/engineeditor/Editor.java

@@ -175,8 +175,8 @@ public void dispose() {
 	}
 
 	public void exit() {
-		if (Ctx.project.getWorld().isModified()
-				|| Ctx.project.getSelectedChapter().isModified()) {
+		if (Ctx.project.getProjectDir() != null && (Ctx.project.getWorld().isModified()
+				|| Ctx.project.getSelectedChapter().isModified())) {
 			new Dialog("Save Project", skin) {
 				protected void result(Object object) {
 					if (((Boolean) object).booleanValue()) {

adventure-composer/src/main/java/com/bladecoder/engineeditor/Main.java

@@ -34,13 +34,13 @@ public static void main(final String[] args) {
 		// cfg.samples = 2;
 		// cfg.useGL30 = true;
 
-		if (Main.class.getResource("/res/images/ic_app64.png") != null)
-			cfg.addIcon("images/ic_app64.png", FileType.Internal);
+		if (Main.class.getResource("/images/ic_app64.png") != null)
+			cfg.addIcon("ic_app64.png", FileType.Internal);
 
-		if (Main.class.getResource("/res/images/ic_app32.png") != null)
+		if (Main.class.getResource("/images/ic_app32.png") != null)
 			cfg.addIcon("images/ic_app32.png", FileType.Internal);
 
-		if (Main.class.getResource("/res/images/ic_app16.png") != null)
+		if (Main.class.getResource("/images/ic_app16.png") != null)
 			cfg.addIcon("images/ic_app16.png", FileType.Internal);
 
 		parseArgs(args);

blade-engine/src/com/bladecoder/engine/loader/ChapterXMLLoader.java

@@ -168,16 +168,13 @@ else if (localName.equals(XMLConstants.ACTOR_TAG)) {
 		} else if (localName.equals(XMLConstants.SCENE_TAG)) {
 			scene.setPlayer((SpriteActor) scene.getActor(player, false));
 			scene.orderLayersByZIndex();
+			scene = null;
 		}
 	}
 
 	private void parseScene(Attributes atts) throws SAXException {
 
 		this.scene = new Scene();
-		scenes.add(scene);
-
-		if (initScene == null)
-			initScene = this.scene.getId();
 
 		String idScn = atts.getValue(XMLConstants.ID_ATTR);
 		String musicFilename = atts.getValue(XMLConstants.MUSIC_ATTR);
@@ -218,6 +215,11 @@ private void parseScene(Attributes atts) throws SAXException {
 
 			scene.setMusic(musicFilename, loopMusic, initialDelay, repeatDelay);
 		}
+		
+		scenes.add(scene);
+
+		if (initScene == null)
+			initScene = this.scene.getId();
 	}
 
 	private void parseActor(Attributes atts) throws SAXException {
@@ -652,8 +654,16 @@ public void setDocumentLocator(Locator l) {
 
 	@Override
 	public void error(SAXParseException e) throws SAXException {
-		EngineLogger.error(MessageFormat.format("{0} Line: {1} Column: {2}. {3}", actor.getId(), e.getLineNumber(),
+		if(actor != null) 
+			EngineLogger.error(MessageFormat.format("{0}.{1} Line: {2} Column: {3}. {4}", scene.getId(), actor.getId(), e.getLineNumber(),
 				e.getColumnNumber(), e.getMessage()));
+		else if(scene != null)
+			EngineLogger.error(MessageFormat.format("{0} Line: {1} Column: {2}. {3}", actor.getId(), e.getLineNumber(),
+					e.getColumnNumber(), e.getMessage()));
+		else
+			EngineLogger.error(MessageFormat.format("Line: {1} Column: {2}. {3}", e.getLineNumber(),
+					e.getColumnNumber(), e.getMessage()));
+		
 		EngineLogger.error("CAUSA", (Exception) e.getCause());
 	}
 

blade-engine/src/com/bladecoder/engine/model/World.java

@@ -684,7 +684,7 @@ public void read(Json json, JsonValue jsonData) {
 		String dialogId = json.readValue("currentDialog", String.class, jsonData);
 
 		if (dialogId != null) {
-			SpriteActor actor = (SpriteActor) instance.getCurrentScene().getActor(actorId, false);
+			BaseActor actor = instance.getCurrentScene().getActor(actorId, false);
 			instance.currentDialog = actor.getDialog(dialogId);
 		}