Set target back to 1.6, Android things.

Signed-off-by: Ken Hoover <[email protected]>
khoover · Jul 2, 2013 · 7f46690 · 7f46690
1 parent 29d194f
commit 7f46690
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/rop-game-android/.classpath b/rop-game-android/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/rop-game"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/rop-game"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="lib" path="/rop-game/libs/gdx.jar" sourcepath="/rop-game/libs/gdx-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/gdx-backend-android.jar" sourcepath="libs/gdx-backend-android-sources.jar"/>

diff --git a/rop-game-android/.settings/org.eclipse.jdt.core.prefs b/rop-game-android/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,11 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6
diff --git a/rop-game/.settings/org.eclipse.jdt.core.prefs b/rop-game/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/rop-game/src/com/kandl/ropgame/model/Recipe.java b/rop-game/src/com/kandl/ropgame/model/Recipe.java
@@ -82,19 +82,19 @@ public Recipe () {
 		cut = new Array<Vector2>(2);
 		pos = new Array<Vector2>(2);
 		int n = (int) (Math.random() * 16);
-		if ((n & 0b0001) != 0) {
+		if ((n & 0x0001) != 0) {
 			cut.add(new Vector2(1, 0));
 			pos.add(new Vector2(0.5f, 0.5f));
 		}
-		if ((n & 0b0010) != 0) {
+		if ((n & 0x0002) != 0) {
 			cut.add(new Vector2(0, 1));
 			pos.add(new Vector2(0.5f, 0.5f));
 		}
-		if ((n & 0b0100) != 0) {
+		if ((n & 0x0004) != 0) {
 			cut.add(new Vector2(1, 1).nor());
 			pos.add(new Vector2(0.5f,0.5f));
 		}
-		if ((n & 0b1000) != 0) {
+		if ((n & 0x0008) != 0) {
 			cut.add(new Vector2(-1,1).nor());
 			pos.add(new Vector2(0.5f,0.5f));
 		}

diff --git a/rop-game/src/com/kandl/ropgame/view/MiniOrderSheet.java b/rop-game/src/com/kandl/ropgame/view/MiniOrderSheet.java
@@ -80,7 +80,6 @@ public void clicked (InputEvent e, float x, float y) {
 			currSprite = i.getIcon();
 			current = new Image(new SpriteDrawable(currSprite));
 			current.setScale(scale * 2);
-			System.out.println(scale * current.getWidth() + ", " + scale * background.getWidth());
 			components.add(current);
 			addActor(current);
 			current.setPosition(10, height - scale * 2 * (50 * ++n));