diff --git a/project/AndroidManifest.xml b/project/AndroidManifest.xml index 5ec49dfca..c2c678c63 100644 --- a/project/AndroidManifest.xml +++ b/project/AndroidManifest.xml @@ -1,8 +1,8 @@ = MODE_LAST-1) { diff --git a/project/jni/application/opentyrian/src/game_menu.cpp b/project/jni/application/opentyrian/src/game_menu.cpp index 456ee6ac4..c27e1c0b5 100644 --- a/project/jni/application/opentyrian/src/game_menu.cpp +++ b/project/jni/application/opentyrian/src/game_menu.cpp @@ -1030,13 +1030,13 @@ void JE_itemScreen( void ) joystick_down |= joystick[j].direction[2]; } - if (keysactive[SDLK_UP] || joystick_up) + if (keysactive[SDLK_UP] || keysactive[SDLK_LCTRL] || joystick_up) { yChg = -1; inputDetected = false; } - if (keysactive[SDLK_DOWN] || joystick_down) + if (keysactive[SDLK_DOWN] || keysactive[SDLK_LALT] || joystick_down) { yChg = 1; inputDetected = false; @@ -1310,6 +1310,7 @@ void JE_itemScreen( void ) break; case SDLK_UP: + case SDLK_LCTRL: keyboardUsed = true; lastDirection = -1; @@ -1335,6 +1336,7 @@ void JE_itemScreen( void ) break; case SDLK_DOWN: + case SDLK_LALT: keyboardUsed = true; lastDirection = 1; diff --git a/project/jni/application/opentyrian/src/jukebox.cpp b/project/jni/application/opentyrian/src/jukebox.cpp index 2cc162cbb..2976f1092 100644 --- a/project/jni/application/opentyrian/src/jukebox.cpp +++ b/project/jni/application/opentyrian/src/jukebox.cpp @@ -156,12 +156,14 @@ void jukebox( void ) case SDLK_LEFT: case SDLK_UP: + case SDLK_LCTRL: play_song((song_playing > 0 ? song_playing : MUSIC_NUM) - 1); stopped = false; break; case SDLK_RETURN: case SDLK_RIGHT: case SDLK_DOWN: + case SDLK_LALT: play_song((song_playing + 1) % MUSIC_NUM); stopped = false; break; diff --git a/project/jni/application/opentyrian/src/mainint.cpp b/project/jni/application/opentyrian/src/mainint.cpp index 894cd72e8..6bf2760fc 100644 --- a/project/jni/application/opentyrian/src/mainint.cpp +++ b/project/jni/application/opentyrian/src/mainint.cpp @@ -269,6 +269,7 @@ void JE_helpSystem( JE_byte startTopic ) switch (lastkey_sym) { case SDLK_UP: + case SDLK_LCTRL: menu--; if (menu < 2) { @@ -277,6 +278,7 @@ void JE_helpSystem( JE_byte startTopic ) JE_playSampleNum(S_CURSOR); break; case SDLK_DOWN: + case SDLK_LALT: menu++; if (menu > TOPICS) { @@ -395,6 +397,7 @@ void JE_helpSystem( JE_byte startTopic ) case SDLK_LEFT: case SDLK_UP: case SDLK_PAGEUP: + case SDLK_LCTRL: page--; JE_playSampleNum(S_CURSOR); break; @@ -403,6 +406,7 @@ void JE_helpSystem( JE_byte startTopic ) case SDLK_PAGEDOWN: case SDLK_RETURN: case SDLK_SPACE: + case SDLK_LALT: if (page == MAX_PAGE) { page = 0; @@ -628,6 +632,7 @@ void JE_loadScreen( void ) switch (lastkey_sym) { case SDLK_UP: + case SDLK_LCTRL: sel--; if (sel < min) { @@ -636,6 +641,7 @@ void JE_loadScreen( void ) JE_playSampleNum(S_CURSOR); break; case SDLK_DOWN: + case SDLK_LALT: sel++; if (sel > max) { @@ -1251,6 +1257,7 @@ JE_boolean JE_inGameSetup( void ) JE_playSampleNum(S_SPRING); break; case SDLK_UP: + case SDLK_LCTRL: if (--sel < 1) { sel = 6; @@ -1258,6 +1265,7 @@ JE_boolean JE_inGameSetup( void ) JE_playSampleNum(S_CURSOR); break; case SDLK_DOWN: + case SDLK_LALT: if (++sel > 6) { sel = 1; @@ -1581,7 +1589,7 @@ void JE_highScoreCheck( void ) if (!playing) play_song(31); - + /* if (mouseButton > 0) { if (mouseX > 56 && mouseX < 142 && mouseY > 123 && mouseY < 149) @@ -1594,10 +1602,14 @@ void JE_highScoreCheck( void ) cancel = true; } } - else if (newkey) + else + */ + if (newkey || newmouse) { bool validkey = false; lastkey_char = toupper(lastkey_char); + if(mouse_pressed[0]) + lastkey_char = SDLK_SPACE; switch(lastkey_char) { //case ' ': diff --git a/project/jni/application/opentyrian/src/menus.cpp b/project/jni/application/opentyrian/src/menus.cpp index e30ecc0c3..0108900c7 100644 --- a/project/jni/application/opentyrian/src/menus.cpp +++ b/project/jni/application/opentyrian/src/menus.cpp @@ -62,6 +62,7 @@ bool select_gameplay( void ) switch (lastkey_sym) { case SDLK_UP: + case SDLK_LCTRL: gameplay--; if (gameplay < 1) { @@ -70,6 +71,7 @@ bool select_gameplay( void ) JE_playSampleNum(S_CURSOR); break; case SDLK_DOWN: + case SDLK_LALT: gameplay++; if (gameplay > gameplay_max) { @@ -139,6 +141,7 @@ bool select_episode( void ) switch (lastkey_sym) { case SDLK_UP: + case SDLK_LCTRL: episode--; if (episode < 1) { @@ -147,6 +150,7 @@ bool select_episode( void ) JE_playSampleNum(S_CURSOR); break; case SDLK_DOWN: + case SDLK_LALT: episode++; if (episode > episode_max) { @@ -225,6 +229,7 @@ bool select_difficulty( void ) switch (lastkey_sym) { case SDLK_UP: + case SDLK_LCTRL: difficultyLevel--; if (difficultyLevel < 1) { @@ -233,6 +238,7 @@ bool select_difficulty( void ) JE_playSampleNum(S_CURSOR); break; case SDLK_DOWN: + case SDLK_LALT: difficultyLevel++; if (difficultyLevel > difficulty_max) { diff --git a/project/jni/application/opentyrian/src/opentyr.cpp b/project/jni/application/opentyrian/src/opentyr.cpp index ce3f78a05..9aea8692d 100644 --- a/project/jni/application/opentyrian/src/opentyr.cpp +++ b/project/jni/application/opentyrian/src/opentyr.cpp @@ -126,6 +126,7 @@ void opentyrian_menu( void ) switch (lastkey_sym) { case SDLK_UP: + case SDLK_LCTRL: sel--; if (sel < 0) { @@ -134,6 +135,7 @@ void opentyrian_menu( void ) JE_playSampleNum(S_CURSOR); break; case SDLK_DOWN: + case SDLK_LALT: sel++; if (sel > maxSel) { diff --git a/project/jni/application/opentyrian/src/tyrian2.cpp b/project/jni/application/opentyrian/src/tyrian2.cpp index d930ed86f..a856f78b1 100644 --- a/project/jni/application/opentyrian/src/tyrian2.cpp +++ b/project/jni/application/opentyrian/src/tyrian2.cpp @@ -3547,6 +3547,7 @@ bool JE_titleScreen( JE_boolean animate ) switch (lastkey_sym) { case SDLK_UP: + case SDLK_LCTRL: if (menu == 0) menu = menunum-1; else @@ -3554,6 +3555,7 @@ bool JE_titleScreen( JE_boolean animate ) JE_playSampleNum(S_CURSOR); break; case SDLK_DOWN: + case SDLK_LALT: if (menu == menunum-1) menu = 0; else diff --git a/project/jni/application/src b/project/jni/application/src index 706424f94..7fa7b8f4e 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -sc2 \ No newline at end of file +opentyrian \ No newline at end of file diff --git a/project/res/values/strings.xml b/project/res/values/strings.xml index 8834ce584..bdeb1e31a 100644 --- a/project/res/values/strings.xml +++ b/project/res/values/strings.xml @@ -1,4 +1,4 @@ - Ur-Quan Masters + OpenTyrian diff --git a/project/src/Accelerometer.java b/project/src/Accelerometer.java index 8fa80d363..b46b829e0 100644 --- a/project/src/Accelerometer.java +++ b/project/src/Accelerometer.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.sourceforge.sc2; +package com.googlecode.opentyrian; import android.app.Activity; import android.content.Context; diff --git a/project/src/AssetExtract.java b/project/src/AssetExtract.java index def4a9179..e664c297d 100644 --- a/project/src/AssetExtract.java +++ b/project/src/AssetExtract.java @@ -1,6 +1,6 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change // spaces amount -package com.sourceforge.sc2; +package com.googlecode.opentyrian; import java.util.zip.*; import java.io.*; diff --git a/project/src/Audio.java b/project/src/Audio.java index 0c25623e1..8e2da1863 100644 --- a/project/src/Audio.java +++ b/project/src/Audio.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.sourceforge.sc2; +package com.googlecode.opentyrian; import android.app.Activity; diff --git a/project/src/DataDownloader.java b/project/src/DataDownloader.java index 973ab3d38..5fb78f0d4 100644 --- a/project/src/DataDownloader.java +++ b/project/src/DataDownloader.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.sourceforge.sc2; +package com.googlecode.opentyrian; import android.app.Activity; import android.content.Context; diff --git a/project/src/GLSurfaceView_SDL.java b/project/src/GLSurfaceView_SDL.java index 03f4bffcf..25aca20b7 100644 --- a/project/src/GLSurfaceView_SDL.java +++ b/project/src/GLSurfaceView_SDL.java @@ -18,7 +18,7 @@ fixed with a hammer and rasp to work with libSDL port */ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.sourceforge.sc2; +package com.googlecode.opentyrian; import java.io.Writer; import java.util.ArrayList; diff --git a/project/src/Globals.java b/project/src/Globals.java index ac1b5d4b0..57eb31bdd 100644 --- a/project/src/Globals.java +++ b/project/src/Globals.java @@ -1,14 +1,14 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere -package com.sourceforge.sc2; +package com.googlecode.opentyrian; import android.app.Activity; import android.content.Context; class Globals { - public static String ApplicationName = "Ur-QuanMasters"; + public static String ApplicationName = "OpenTyrian"; // Should be zip file - public static String DataDownloadUrl = "Game data is 14 Mb|https://sites.google.com/site/xpelyax/Home/sc2-data.zip?attredirects=0%26d=1|https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/sc2-data.zip/download|http://sitesproxy.goapk.com/site/xpelyax/Home/sc2-data.zip^3DO remixed music (19 Mb) - enable it in Setup->Sound Options->3DO Remixes|:addons/3domusic/3domusic.zip:https://sites.google.com/site/xpelyax/Home/3domusic.zip?attredirects=0%26d=1|:addons/3domusic/3domusic.zip:https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3domusic.zip/download|:addons/3domusic/3domusic.zip:http://sitesproxy.goapk.com/site/xpelyax/Home/3domusic.zip^UQM music remix pack 1 (50 Mb) - enable it in Setup->Sound Options->UQM Remixes|:addons/remix/uqm-remix-pack1.zip:http://sourceforge.net/projects/sc2/files/UQM%20Remix%20Packs/UQM%20Remix%20Pack%201/uqm-remix-pack1.zip/download^UQM music remix pack 2 (60 Mb)|:addons/remix/uqm-remix-pack2.zip:http://sourceforge.net/projects/sc2/files/UQM%20Remix%20Packs/UQM%20Remix%20Pack%202/uqm-remix-pack2.zip/download^UQM music remix pack 3 (40 Mb)|:addons/remix/uqm-remix-pack3.zip:http://sourceforge.net/projects/sc2/files/UQM%20Remix%20Packs/UQM%20Remix%20Pack%203/uqm-remix-pack3.zip/download^3DO voice (115 Mb) - go to Setup->Sound Options and increase Voice volume from zero|:addons/3dovoice/3dovoice.zip:https://sourceforge.net/projects/libsdl-android/files/Ur-Quan%20Masters/3dovoice.zip/download"; + public static String DataDownloadUrl = "Data files size is 11 Mb|http://sites.google.com/site/xpelyax/Home/tyrian21-data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/tyrian21-data.zip"; // Set this value to true if you're planning to render 3D using OpenGL - it eats some GFX resources, so disabled for 2D public static boolean NeedDepthBuffer = false; @@ -19,7 +19,7 @@ class Globals { // Readme text to be shown on download page public static String ReadmeText = "^You may press \"Home\" now - the data will be downloaded in background".replace("^","\n"); - public static boolean AppUsesMouse = false; + public static boolean AppUsesMouse = true; public static boolean AppNeedsArrowKeys = true; @@ -27,9 +27,9 @@ class Globals { public static boolean AppUsesMultitouch = false; - public static int AppTouchscreenKeyboardKeysAmount = 2; + public static int AppTouchscreenKeyboardKeysAmount = 4; - public static int AppTouchscreenKeyboardKeysAmountAutoFire = 2; + public static int AppTouchscreenKeyboardKeysAmountAutoFire = 1; // Phone-specific config // It will download app data to /sdcard/alienblaster if set to true, @@ -48,5 +48,5 @@ class Globals { } class LoadLibrary { - public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_image"); }; + public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_net"); }; } diff --git a/project/src/MainActivity.java b/project/src/MainActivity.java index 089ae237d..ee9616c3c 100644 --- a/project/src/MainActivity.java +++ b/project/src/MainActivity.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.sourceforge.sc2; +package com.googlecode.opentyrian; import android.app.Activity; import android.content.Context; diff --git a/project/src/Settings.java b/project/src/Settings.java index b0fb79a41..e36544f93 100644 --- a/project/src/Settings.java +++ b/project/src/Settings.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.sourceforge.sc2; +package com.googlecode.opentyrian; import android.app.Activity; import android.content.Context; diff --git a/project/src/Video.java b/project/src/Video.java index 773c1ae11..01411d628 100644 --- a/project/src/Video.java +++ b/project/src/Video.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.sourceforge.sc2; +package com.googlecode.opentyrian; import javax.microedition.khronos.opengles.GL10;