diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a88a9ce..771847e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="30" + android:versionName="2.6"> The touch flag is a special case that denotes that + * this is purely a launch request, regardless of the keypress. + * @param keyCode - the virtual keypress to simulate. + * @param touchFire - true to set the flag to simulate a + * launch request. */ - public final void setAction(int keyCode, boolean touch) { - if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) { + public final void setAction(int keyCode, boolean touchFire) { + if (touchFire) { + mTouchFire = true; + } + else if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) { mWasCenter = true; } else if (keyCode == KeyEvent.KEYCODE_DPAD_DOWN) { @@ -149,12 +156,7 @@ else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) { mWasRight = true; } else if (keyCode == KeyEvent.KEYCODE_DPAD_UP) { - if (touch) { - mTouchFire = true; - } - else { - mWasUp = true; - } + mWasUp = true; } } diff --git a/src/org/jfedor/frozenbubble/FrozenGame.java b/src/org/jfedor/frozenbubble/FrozenGame.java index 666951a..8e0d848 100644 --- a/src/org/jfedor/frozenbubble/FrozenGame.java +++ b/src/org/jfedor/frozenbubble/FrozenGame.java @@ -671,7 +671,7 @@ public gameEnum play(boolean key_left, boolean key_right, attackBarBubbles = malusBar.getAttackBarBubbles(); } - if ((ats && ats_touch_fire) || (!ats && touch_fire)) { + if ((ats && ats_touch_fire) || ((!ats || isRemote) && touch_fire)) { key_fire = true; }