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

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

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