Fix for latest SP2 API change. And add some minor android related changes.

Author: daid

src/controls.cpp

@@ -17,16 +17,16 @@ Controls::Controls(int index)
 {
     if (index == 0)
     {
-        up.setKeys("up", "keypad 8");
-        down.setKeys("down", "keypad 2");
-        left.setKeys("left", "keypad 4");
-        right.setKeys("right", "keypad 6");
+        up.setKeys({"up", "keypad 8"});
+        down.setKeys({"down", "keypad 2"});
+        left.setKeys({"left", "keypad 4"});
+        right.setKeys({"right", "keypad 6"});
 
         primary_action.setKey("space");
-        secondary_action.setKey("z");
+        secondary_action.setKeys({"z", "Menu"});
 
         unknown2.setKey("x");
-        self_destruct.setKey("c");
+        self_destruct.setKeys({"c", "AC Back"}); //"AC Back" is the back key in android
         replay_time.setKey("v");
         replay_fuel.setKey("b");
 
@@ -86,6 +86,10 @@ PlayerControlsState Controls::playerControlStateFromKeybindings()
     result.left = KeyState(left);
     result.right = KeyState(right);
     result.primary_action = KeyState(primary_action);
+#ifdef ANDROID
+    if (result.left.pressed && result.right.pressed)
+        result.primary_action.pressed = true;
+#endif
     result.secondary_action = KeyState(secondary_action);
     result.unknown2 = KeyState(unknown2);
     result.self_destruct = KeyState(self_destruct);

src/main.cpp

@@ -4,6 +4,7 @@
 #include <sp2/assert.h>
 #include <sp2/random.h>
 #include <sp2/io/directoryResourceProvider.h>
+#include <sp2/io/virtualTouchKeys.h>
 #include <sp2/graphics/gui/widget/button.h>
 #include <sp2/graphics/gui/scene.h>
 #include <sp2/graphics/gui/theme.h>
@@ -56,6 +57,13 @@ int main(int argc, char** argv)
 #endif
     window->addLayer(scene_layer);
 
+#ifdef ANDROID
+    sp::io::VirtualTouchKeyLayer* touch_layer = new sp::io::VirtualTouchKeyLayer(50);
+    touch_layer->addButton(sp::Rect2f(sp::Vector2f(0, 0), sp::Vector2f(0.5, 1.0)), controls[0].left);
+    touch_layer->addButton(sp::Rect2f(sp::Vector2f(0.5, 0), sp::Vector2f(0.5, 1)), controls[0].right);
+    window->addLayer(touch_layer);
+#endif
+
     new LevelScene();
     new LevelSelect();
     engine->run();