aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backends/platform/android/android.cpp6
-rw-r--r--backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java2
-rw-r--r--backends/platform/android/org/inodes/gus/scummvm/ScummVM.java2
-rw-r--r--backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java4
4 files changed, 7 insertions, 7 deletions
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 76590ec823..a6258df554 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -703,10 +703,10 @@ void OSystem_Android::setPalette(const byte* colors, uint start, uint num) {
palette += 3;
colors += 4;
} while (--num);
-}
-
+}
+
void OSystem_Android::grabPalette(byte *colors, uint start, uint num) {
- ENTER("grabPalette(%p, %u, %u)", colors, start, num);
+ ENTER("grabPalette(%p, %u, %u)", colors, start, num);
const byte* palette = _game_texture->palette_const() + start*3;
do {
for (int i = 0; i < 3; ++i)
diff --git a/backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java b/backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java
index b4035a296b..840f3440d5 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java
+++ b/backends/platform/android/org/inodes/gus/scummvm/PluginProvider.java
@@ -42,7 +42,7 @@ public class PluginProvider extends BroadcastReceiver {
.authority(context.getPackageName())
.path(mylib)
.toString());
-
+
extras.putStringArrayList(ScummVMApplication.EXTRA_UNPACK_LIBS,
all_libs);
}
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
index bc0c5ef408..f4dca0e7e5 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
+++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVM.java
@@ -42,7 +42,7 @@ public class ScummVM implements SurfaceHolder.Callback {
create(context.getAssets()); // Init C++ code, set nativeScummVM
}
- private native void nativeDestroy();
+ private native void nativeDestroy();
public synchronized void destroy() {
if (nativeScummVM != 0) {
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
index 29e1eba3d3..fb3cd6348f 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
@@ -83,7 +83,7 @@ public class ScummVMActivity extends Activity {
}
});
}
- }
+ }
}
private MyScummVM scummvm;
private Thread scummvm_thread;
@@ -353,7 +353,7 @@ public class ScummVMActivity extends Activity {
e.kbd_ascii = kevent.getUnicodeChar();
if (e.kbd_ascii == 0)
e.kbd_ascii = e.kbd_keycode; // scummvm keycodes are mostly ascii
-
+
e.kbd_flags = 0;
if (kevent.isAltPressed())