miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenTyrian: Volume Up/Down keys navigate menu, mouse click will exit Enter High Score screen

Browse Source
This commit is contained in:
pelya
2010-09-20 15:53:04 +03:00
parent c8cdb9455e
commit f99fd72f38
22 changed files with 65 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
project/jni/application/opentyrian/AndroidAppSettings.cfg
View File

@@ -1,4 +1,5 @@
AppSettingVersion=6
# The application settings for Android libSDL port
AppSettingVersion=8
LibSdlVersion=1.2
AppName="OpenTyrian"
AppFullName=com.googlecode.opentyrian
@@ -14,9 +15,11 @@ RedefinedKeys="SPACE RETURN LCTRL LALT SPACE"
AppTouchscreenKeyboardKeysAmount=4
AppTouchscreenKeyboardKeysAmountAutoFire=1
MultiABI=n
AppVersionCode=2109
AppVersionName="2.1.09"
AppVersionCode=2110
AppVersionName="2.1.10 - minor fixes here and there, menu navigation with Volume Up/Down keys, use Menu button to select"
CompiledLibraries="sdl_net"
CustomBuildScript=n
AppCflags='-finline-functions -O2'
AppLdflags=''
AppSubdirsBuild=''
ReadmeText='^You may press "Home" now - the data will be downloaded in background'

4
project/jni/application/opentyrian/src/destruct.cpp
View File

@@ -840,7 +840,7 @@ enum de_mode_t JE_modeSelect( void )
{
break; /* User has selected, return choice */
}
if (keysactive[SDLK_UP])
if (keysactive[SDLK_UP] || keysactive[SDLK_LCTRL])
{
if(mode == MODE_FIRST)
{
@@ -854,7 +854,7 @@ enum de_mode_t JE_modeSelect( void )
mode--;
}
}
if (keysactive[SDLK_DOWN])
if (keysactive[SDLK_DOWN] || keysactive[SDLK_LALT])
{
if(mode >= MODE_LAST-1)
{

6
project/jni/application/opentyrian/src/game_menu.cpp
View File

@@ -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;

2
project/jni/application/opentyrian/src/jukebox.cpp
View File

@@ -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;

16
project/jni/application/opentyrian/src/mainint.cpp
View File

@@ -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 ' ':

6
project/jni/application/opentyrian/src/menus.cpp
View File

@@ -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)
{

2
project/jni/application/opentyrian/src/opentyr.cpp
View File

@@ -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)
{

2
project/jni/application/opentyrian/src/tyrian2.cpp
View File

@@ -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

2
project/jni/application/src
View File

@@ -1 +1 @@
sc2
opentyrian