dialog fix when ending dialog

Author: bladecoder

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

@@ -74,10 +74,6 @@ else if(next.equalsIgnoreCase("root"))
 			else
 				currentOption = findSerOption(next);
 		}
-		
-		if (ended()) {
-			World.getInstance().setCurrentDialog(null);
-		}
 	}
 
 	public void addOption(DialogOption o) {

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

@@ -406,6 +406,17 @@ public void setCurrentDialog(Dialog dialog) {
 		if (dialog != null)
 			dialog.reset();
 	}
+	
+	public void selectDialogOption(int i) {
+		if(currentDialog == null)
+			return;
+		
+		currentDialog.selectOption(i);
+		
+		if (currentDialog.ended()) {
+			currentDialog = null;
+		}
+	}
 
 	public int getWidth() {
 		return width;

blade-engine/src/com/bladecoder/engine/ui/DialogUI.java

@@ -17,9 +17,6 @@
 
 import java.util.ArrayList;
 
-import com.bladecoder.engine.ui.Recorder;
-import com.bladecoder.engine.ui.SceneScreen;
-
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
@@ -28,7 +25,6 @@
 import com.badlogic.gdx.scenes.scene2d.InputListener;
 import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
 import com.bladecoder.engine.i18n.I18N;
-import com.bladecoder.engine.model.Dialog;
 import com.bladecoder.engine.model.DialogOption;
 import com.bladecoder.engine.model.World;
 import com.bladecoder.engine.util.DPIUtils;
@@ -146,19 +142,12 @@ private int getOption(float x, float y) {
 	}
 
 	private void select(int i) {
-		Dialog d = World.getInstance().getCurrentDialog();
-
 		// RECORD
 		if (recorder.isRecording()) {
 			recorder.add(i);
 		}
 
-		d.selectOption(i);
-
-//		if (World.getInstance().getCurrentDialog().ended()) {
-//			selected = -1;
-//			setVisible(false);
-//		}
+		World.getInstance().selectDialogOption(i);
 	}
 
 	/** The style for the DialogUI */

blade-engine/src/com/bladecoder/engine/ui/Recorder.java

@@ -75,13 +75,8 @@ public void update(float delta) {
 			// while (playing && v.time < time) {
 			if (playing && v.time < time) {
 				if (v.verb == null) {
-					if (v.pos == null) { // DIALOG OPTION
-						Dialog d = World.getInstance().getCurrentDialog();
-						d.selectOption(v.dialogOption);
-						
-						if (World.getInstance().getCurrentDialog().ended()) {
-							World.getInstance().setCurrentDialog(null);
-						}
+					if (v.pos == null) { // DIALOG OPTION						
+						World.getInstance().selectDialogOption(v.dialogOption);
 
 						stringBuilder.append(" SELECT DIALOG OPTION: ").append(v.dialogOption);
 					} else { // GOTO

blade-engine/src/com/bladecoder/engine/ui/TesterBot.java

@@ -198,7 +198,7 @@ public void update(float d) {
 				if(visibleOptions.size() > 0) {
 					int pos = MathUtils.random(visibleOptions.size() - 1);
 					EngineLogger.debug("<TESTERBOT> SELECT OPTION: " + pos);
-					w.getCurrentDialog().selectOption(pos);
+					w.selectDialogOption(pos);
 				}
 			}
 		}