Fixed dealing with OpenAL bug in credits screen and bug extracting ink texts.

Author: bladecoder

adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ModelTools.java

@@ -507,7 +507,7 @@ else if (v.name.equals("s"))
 				extractInkTextsInternal(aValue, sbTSV, sbMD, prop);
 			}
 
-		} else if (v.isString() && v.asString().charAt(0) == '^') {
+		} else if (v.isString() && !v.asString().isEmpty() && v.asString().charAt(0) == '^') {
 			String value = v.asString().substring(1).trim();
 
 			if (value.length() == 0 || value.charAt(0) == '>')

adventure-editor/src/main/resources/versions.properties

@@ -5,4 +5,4 @@ buildToolsVersion=29.0.2
 libgdxVersion=1.9.10
 roboVMGradlePluginVersion=2.3.7
 roboVMVersion=2.3.8
-version=3.2.4
+version=3.2.5-SNAPSHOT

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

@@ -23,6 +23,7 @@
 import java.util.Locale;
 import java.util.Map;
 
+import com.badlogic.gdx.Application.ApplicationType;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
 import com.badlogic.gdx.InputAdapter;
@@ -70,8 +71,7 @@ public class CreditsScreen extends ScreenAdapter implements BladeScreen {
 	private final InputProcessor inputProcessor = new InputAdapter() {
 		@Override
 		public boolean keyUp(int keycode) {
-			if (keycode == Input.Keys.ESCAPE
-					|| keycode == Input.Keys.BACK)
+			if (keycode == Input.Keys.ESCAPE || keycode == Input.Keys.BACK)
 				ui.setCurrentScreen(Screens.MENU_SCREEN);
 
 			return true;
@@ -110,31 +110,32 @@ public void render(float delta) {
 		for (int i = stringHead; i < credits.size(); i++) {
 			String s = credits.get(i);
 
-			char type = 'c'; // types are 'c' -> credit, 't' -> title, 'i' -> image, 's' -> space, 'm' -> music
+			char type = 'c'; // types are 'c' -> credit, 't' -> title, 'i' -> image, 's' -> space, 'm' ->
+								// music
 
 			if (s.indexOf('#') != -1) {
 				type = s.charAt(0);
 				s = s.substring(2);
 			}
 
 			switch (type) {
-				case 't':
-					y = processCreditTitle(batch, width, height, y, i, s);
-					break;
-				case 'i':
-					y = processCreditImage(batch, width, height, y, i, s);
-					break;
-				case 's':
-					y = processCreditSpace(height, y, i, s);
-					break;
-				case 'm':
-					processCreditMusic(s);
-					credits.remove(i);
-					i--;
-					break;
-				default:
-					y = processCreditDefault(batch, width, height, y, i, s);
-					break;
+			case 't':
+				y = processCreditTitle(batch, width, height, y, i, s);
+				break;
+			case 'i':
+				y = processCreditImage(batch, width, height, y, i, s);
+				break;
+			case 's':
+				y = processCreditSpace(height, y, i, s);
+				break;
+			case 'm':
+				processCreditMusic(s);
+				credits.remove(i);
+				i--;
+				break;
+			default:
+				y = processCreditDefault(batch, width, height, y, i, s);
+				break;
 			}
 
 			if (y < 0) {
@@ -188,22 +189,34 @@ private float processCreditSpace(int height, float y, int i, String s) {
 	private void processCreditMusic(final String s) {
 		if (music != null)
 			music.dispose();
-		
-		final String sound = EngineAssetManager.getInstance().checkIOSSoundName("music/" + s);
+
+		final String file = EngineAssetManager.getInstance().checkIOSSoundName("music/" + s);
 
 		new Thread() {
 			@Override
 			public void run() {
-				music = Gdx.audio.newMusic(EngineAssetManager.getInstance().getAsset(sound));
-				
+				music = Gdx.audio.newMusic(EngineAssetManager.getInstance().getAsset(file));
+
 				try {
 					music.play();
-				} catch(Exception e) {
-					// sometimes the play method fails on desktop.
-					EngineLogger.error("Error Playing music: " + s, e);
+					music.setVolume(0.5f);
+				} catch (Exception e) {
+
+					// DEAL WITH OPENAL BUG
+					if (Gdx.app.getType() == ApplicationType.Desktop && e.getMessage().contains("40963")) {
+						EngineLogger.debug("!!!!!!!!!!!!!!!!!!!!!!!ERROR playing music trying again...!!!!!!!!!!!!!!!");
+
+						music = Gdx.audio.newMusic(EngineAssetManager.getInstance().getAsset(file));
+						music.play();
+						music.setVolume(0.5f);
+
+						return;
+					}
+
+					EngineLogger.error("Error Playing music: " + file);
 				}
 			}
-		}.start();	
+		}.start();
 	}
 
 	private float processCreditDefault(SpriteBatch batch, int width, int height, float y, int i, String s) {
@@ -307,7 +320,7 @@ public void drawCenteredScreenX(SpriteBatch batch, BitmapFont font, CharSequence
 
 		layout.setText(font, str, Color.WHITE, viewportWidth, Align.center, true);
 
-		//x = (viewportWidth - layout.width)/2;
+		// x = (viewportWidth - layout.width)/2;
 
 		font.draw(batch, layout, x, y);
 	}

gradle.properties

@@ -1,4 +1,4 @@
-version=3.2.4
+version=3.2.5-SNAPSHOT
 libgdxVersion=1.9.10
 roboVMVersion=2.3.8
 roboVMGradlePluginVersion=2.3.7