diff --git a/rop-game-android/.classpath b/rop-game-android/.classpath index 514fc75..3e20ecc 100644 --- a/rop-game-android/.classpath +++ b/rop-game-android/.classpath @@ -1,8 +1,8 @@ + - diff --git a/rop-game-android/.settings/org.eclipse.jdt.core.prefs b/rop-game-android/.settings/org.eclipse.jdt.core.prefs index 48ab4c6..54e493c 100644 --- 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 index 838bd9d..54e493c 100644 --- 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 index 5da4217..c9a1038 100644 --- 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(2); pos = new Array(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 index 7532c63..095fc95 100644 --- 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));