fix compiler warnings when default character encoding is UTF-8, comme…

…nts changed to ascii code
CmdrStardust · Jan 11, 2016 · ea1fbc1 · ea1fbc1
1 parent e8c5ebb
commit ea1fbc1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/de/phbouillon/android/framework/impl/gl/font/GLText.java b/src/de/phbouillon/android/framework/impl/gl/font/GLText.java
@@ -45,13 +45,13 @@ public class GLText {
 	public final static int CHAR_START = 32; // First Character (ASCII Code)
 	public final static int CHAR_END = 126; // Last Character (ASCII Code)
 
-	// 169: ©	
-	// 201: É
-	// 233: é
-	// 235: ë
-	// 176: °
+	// 169: copyright
+	// 201: E-acute
+	// 233: e-acute
+	// 235: e-diaeresis
+	// 176: degree sign
 	public final static int [] ADDITIONAL_CHARS = new int [] {169, 201, 233, 235, 176};	
-	public final static char [] ADDITIONAL_CHARS_STR = new char [] {'©', 'É', 'é', 'ë', '°'};
+	public final static char [] ADDITIONAL_CHARS_STR = new char [] { '\u00a9', '\u00c9', '\u00e9', '\u00eb', '\u00b0' };
 
 	public final static int CHAR_CNT = (((CHAR_END - CHAR_START + ADDITIONAL_CHARS.length) + 1) + 1); // Character
 																			// Count

diff --git a/src/de/phbouillon/android/games/alite/screens/canvas/ShipEditorScreen.java b/src/de/phbouillon/android/games/alite/screens/canvas/ShipEditorScreen.java
@@ -538,9 +538,9 @@ public void getNextShip() {
 		else if (currentShip instanceof WolfMkII) currentShip = new Gopher(a); // Textur fehlt
 		else if (currentShip instanceof Gopher) currentShip = new Coral(a);  // Ok
 		else if (currentShip instanceof Coral) currentShip = new Bushmaster(a); // Invertiert!
-		else if (currentShip instanceof Bushmaster) currentShip = new Rattlesnake(a); // Schönes Teil
+		else if (currentShip instanceof Bushmaster) currentShip = new Rattlesnake(a); // Schones Teil
 		else if (currentShip instanceof Rattlesnake) currentShip = new Mussurana(a); // Invertiert?!
-		else if (currentShip instanceof Mussurana) currentShip = new Dugite(a); //Invertiert? Schön!
+		else if (currentShip instanceof Mussurana) currentShip = new Dugite(a); //Invertiert? Schon!
 		else if (currentShip instanceof Dugite) currentShip = new Yellowbelly(a); //Ok. Auch invertiert?
 		else if (currentShip instanceof Yellowbelly) currentShip = new Indigo(a); // Yay!!
 		else if (currentShip instanceof Indigo) currentShip = new Harlequin(a); // Yeaah!!

diff --git a/src/de/phbouillon/android/games/alite/screens/canvas/ShipIntroScreen.java b/src/de/phbouillon/android/games/alite/screens/canvas/ShipIntroScreen.java
@@ -276,7 +276,7 @@ public void present(float deltaTime) {
 		}
 		centerTextWide(currentShip.getName(), 80, Assets.titleFont, AliteColors.get().shipTitle());
 		g.drawText("Alite is inspired by classic Elite", 1450, 1020, AliteColors.get().mainText(), Assets.smallFont);
-		g.drawText("© Acornsoft, Bell & Braben", 1450, 1050, AliteColors.get().mainText(), Assets.smallFont);
+		g.drawText("\u00a9 Acornsoft, Bell & Braben", 1450, 1050, AliteColors.get().mainText(), Assets.smallFont);
 		debugExhausts();
 		((Alite) game).getTextureManager().setTexture(null);
 		yesButton.render(g);

diff --git a/src/de/phbouillon/android/games/alite/screens/canvas/tutorial/TutBasicFlying.java b/src/de/phbouillon/android/games/alite/screens/canvas/tutorial/TutBasicFlying.java
@@ -652,7 +652,7 @@ public void execute(float deltaTime) {
 				// ALSO wird _AUCH_ (!) der Destruction Callback serialisiert.
 				// DER wiederum muss die Referenz auf die TutorialLine halten --- was knallt, weil
 				// die nicht serializable ist.
-				// LÖSUNG: Vor dem write Object die destruction Callbacks der Targets löschen...
+				// LOSUNG: Vor dem write Object die destruction Callbacks der Targets loschen...
 				if (target2.getDestructionCallbacks().isEmpty()) {
 					target2.addDestructionCallback(new DestructionCallback() {
 						transient TutorialLine tLine = line;

diff --git a/src/de/phbouillon/android/games/alite/screens/opengl/AboutScreen.java b/src/de/phbouillon/android/games/alite/screens/opengl/AboutScreen.java
@@ -94,7 +94,7 @@ public class AboutScreen extends GlScreen {
 			                       "[ 602.0y]Steven Phillips\n" +
 
 	                               "[2501.5y]Alite is inspired by classic Elite\n" +
-			                       "[ 601.5y]© Acornsoft, Bell & Braben\n" +
+			                       "[ 601.5y]\u00a9 Acornsoft, Bell & Braben\n" +
 
 	                               "[2501.5w]Intro Movie\n" +
 	                               "[1001.5w]Production, Modeling, Rendering\n" +
@@ -145,7 +145,7 @@ public class AboutScreen extends GlScreen {
 	                               "[ 902.0y]Giles Williams\n" +
 	                               "[ 902.0y]Jens Ayton\n" +
 	                               "[ 902.0y]Clym Angus\n" +
-	                               "[ 902.0y]Marko Susimetsä\n" +
+	                               "[ 902.0y]Marko Susimets\u00e4\n" +
 	                               "[ 902.0y]ADCK\n" +
 	                               "[ 902.0y]Captain Beatnik\n" +	                               
 	                               "[ 902.0y]DeepSpace\n" +

diff --git a/src/de/phbouillon/android/games/alite/screens/opengl/objects/space/ships/Bushmaster.java b/src/de/phbouillon/android/games/alite/screens/opengl/objects/space/ships/Bushmaster.java
@@ -19,7 +19,7 @@
  */
 
 /**
- * Drake Mk II model and texture by Marko Susimetsä (Wolfwood)
+ * Drake Mk II model and texture by Marko Susimetsa (Wolfwood)
  * Renamed to Bushmaster for Alite. 
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
      */
     /**
-     * Drake Mk II model and texture by Marko Susimetsä (Wolfwood)
+     * Drake Mk II model and texture by Marko Susimetsa (Wolfwood)
      * Renamed to Bushmaster for Alite.
      */
@@ Expand Down @@