162,20 → 162,27 |
{ |
if ((keyCode>=KEY_NUM0)&&(keyCode<=KEY_NUM9)) |
return 1<<(keyCode-KEY_NUM0); |
else |
switch (getGameAction( keyCode )) |
{ |
case UP: |
return 1<<10; |
case DOWN: |
return 1<<11; |
case LEFT: |
return 1<<12; |
case RIGHT: |
return 1<<13; |
case FIRE: |
return 1<<14; |
} |
|
switch (getGameAction( keyCode )) |
{ |
case UP: |
return 1<<10; |
case DOWN: |
return 1<<11; |
case LEFT: |
return 1<<12; |
case RIGHT: |
return 1<<13; |
case FIRE: |
return 1<<14; |
|
} |
|
switch ( keyCode ) |
{ |
case KEY_STAR: |
return 1<<15; |
} |
// log("unmapped key"); |
return 0; // cant translate |
} |
386,6 → 393,9 |
// only mk |
if (mk.is_mk()) |
{ |
// tmp_menu_add("Start Engines",ACTIONID_START_ENGINES); |
|
|
tmp_menu_add(l(STRINGID_MOTORTEST),ACTIONID_MOTORTEST); |
tmp_menu_add(l(STRINGID_KEYCONTROL),ACTIONID_KEYCONTROL); |
tmp_menu_add(l(STRINGID_RCDATA),ACTIONID_RCDATA); |
395,7 → 405,7 |
tmp_menu_add("Mixer",ACTIONID_SELECT_MIXER); |
} |
|
if ( mk.is_rangeextender()|| mk.is_followme() ) |
if ( mk.is_rangeextender()|| mk.is_followme() || mk.is_riddim() ) |
{ |
tmp_menu_add(l(STRINGID_LCD),ACTIONID_LCD); |
tmp_menu_add(l(STRINGID_DEBUG_VALUES),ACTIONID_RAWDEBUG); |
1836,7 → 1846,12 |
|
g.drawString("do volts sound"+ settings.do_volts_sound ,0,y_off,Graphics.TOP | Graphics.LEFT); |
y_off+=spacer_small; |
|
|
|
//#endif |
|
|
break; |
case STATEID_DATABUFF: |
|
2040,6 → 2055,13 |
g.drawString("6 or 9 =>gas " + mk.extern_control[EXTERN_CONTROL_GAS],0,y_off,Graphics.TOP | Graphics.LEFT); |
|
y_off+=spacer_medium; |
g.drawString("5 => start engines ",0,y_off,Graphics.TOP | Graphics.LEFT); |
|
// y_off+=spacer_medium; |
//g.drawString("5 => start engines ",0,y_off,Graphics.TOP | Graphics.LEFT); |
|
|
y_off+=spacer_medium; |
g.drawString("* and # =>exit",0,y_off,Graphics.TOP | Graphics.LEFT); |
y_off+=spacer_medium; |
/* g.drawString("* and Fire =>Start Engines",0,y_off,Graphics.TOP | Graphics.LEFT); |
3165,6 → 3187,10 |
case ACTIONID_EDIT_PARAMS: |
chg_state(STATEID_EDIT_PARAMS); |
break; |
|
case ACTIONID_START_ENGINES: |
mk.start_engines(); |
break; |
case ACTIONID_SELECT_PARAMS: |
select_paramset4edit=true; |
read_paramset_intension_save=false; |
3403,22 → 3429,23 |
// key-actions common in all states |
debug.process_key(keyCode); |
|
|
|
if ( key_bitfield==(keyCode2mask(KEY_NUM0)|keyCode2mask(KEY_STAR))) |
{ |
chg_state(STATEID_MAINMENU); |
return; |
} |
|
|
|
if (state!=STATEID_MAP) |
{ |
if (((keyCode==KEY_STAR) || (keyCode==settings.key_back) )&&(state!=STATEID_KEYCONTROL))//&&(state!= STATEID_STRINGINPUT)) |
{ |
chg_state(STATEID_MAINMENU); |
return; |
if (((keyCode==KEY_STAR) || (keyCode==settings.key_back) )&&(state!=STATEID_KEYCONTROL))//&&(state!= STATEID_STRINGINPUT)) |
{ |
chg_state(STATEID_MAINMENU); |
return; |
} |
} |
} |
|
|
if (((keyCode==KEY_POUND)||(keyCode==settings.key_fullscreen))&&(state!=STATEID_KEYCONTROL)) |
{ |
settings.toggle_fullscreen(); |
3622,6 → 3649,8 |
mod_external_control_by_keycode(keyCode,(byte)1); |
|
|
if (keyCode==KEY_NUM5) |
process_action(ACTIONID_START_ENGINES); |
|
if (keycontrol_exit==3) |
chg_state(STATEID_MAINMENU); |