mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-05 15:27:46 -04:00
ABC turbo
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@553 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
parent
916363c86d
commit
f0f0d2df76
15 changed files with 222 additions and 155 deletions
|
@ -438,36 +438,6 @@ static char *romsel_loop(char *curr_path)
|
|||
}
|
||||
#endif
|
||||
|
||||
// ------------ debug menu ------------
|
||||
|
||||
char *debugString(void);
|
||||
|
||||
static void draw_debug(void)
|
||||
{
|
||||
char *p, *str = debugString();
|
||||
int len, line;
|
||||
|
||||
menu_draw_begin(1);
|
||||
|
||||
p = str;
|
||||
for (line = 0; line < 24; line++)
|
||||
{
|
||||
while (*p && *p != '\n') p++;
|
||||
len = p - str;
|
||||
if (len > 55) len = 55;
|
||||
smalltext_out16_lim(1, line*10, str, 0xffff, len);
|
||||
if (*p == 0) break;
|
||||
p++; str = p;
|
||||
}
|
||||
menu_draw_end();
|
||||
}
|
||||
|
||||
static void debug_menu_loop(void)
|
||||
{
|
||||
draw_debug();
|
||||
wait_for_input(BTN_PLAY|BTN_STOP);
|
||||
}
|
||||
|
||||
// ------------ patch/gg menu ------------
|
||||
|
||||
static void draw_patchlist(int sel)
|
||||
|
@ -692,14 +662,14 @@ static int count_bound_keys(int action, int pl_idx)
|
|||
|
||||
static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_idx, int sel)
|
||||
{
|
||||
int x, y, tl_y = 40, i;
|
||||
int x, y, tl_y = 30, i;
|
||||
|
||||
menu_draw_begin(1);
|
||||
if (player_idx >= 0) {
|
||||
text_out16(80, 20, "Player %i controls", player_idx + 1);
|
||||
text_out16(80, 10, "Player %i controls", player_idx + 1);
|
||||
x = 80;
|
||||
} else {
|
||||
text_out16(80, 20, "Emulator controls");
|
||||
text_out16(80, 10, "Emulator controls");
|
||||
x = 40;
|
||||
}
|
||||
|
||||
|
@ -712,14 +682,14 @@ static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_
|
|||
text_out16(x, y, "Done");
|
||||
|
||||
if (sel < opt_cnt) {
|
||||
text_out16(30, 180, "Press a button to bind/unbind");
|
||||
text_out16(30, 190, "Use HOME to clear");
|
||||
text_out16(30, 200, "To bind UP/DOWN, hold HOME");
|
||||
text_out16(30, 210, "Select \"Done\" to exit");
|
||||
text_out16(30, 195, "Press a button to bind/unbind");
|
||||
text_out16(30, 205, "Use HOME to clear");
|
||||
text_out16(30, 215, "To bind UP/DOWN, hold HOME");
|
||||
text_out16(30, 225, "Select \"Done\" to exit");
|
||||
} else {
|
||||
text_out16(30, 190, "Use Options -> Save cfg");
|
||||
text_out16(30, 200, "to save controls");
|
||||
text_out16(30, 210, "Press PLAY or STOP to exit");
|
||||
text_out16(30, 205, "Use Options -> Save cfg");
|
||||
text_out16(30, 215, "to save controls");
|
||||
text_out16(30, 225, "Press PLAY or STOP to exit");
|
||||
}
|
||||
menu_draw_end();
|
||||
}
|
||||
|
@ -761,6 +731,19 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
|
|||
}
|
||||
}
|
||||
|
||||
menu_entry ctrlopt_entries[] =
|
||||
{
|
||||
{ "Player 1", MB_NONE, MA_CTRL_PLAYER1, NULL, 0, 0, 0, 1, 0 },
|
||||
{ "Player 2", MB_NONE, MA_CTRL_PLAYER2, NULL, 0, 0, 0, 1, 0 },
|
||||
{ "Emulator controls", MB_NONE, MA_CTRL_EMU, NULL, 0, 0, 0, 1, 0 },
|
||||
{ "6 button pad", MB_ONOFF, MA_OPT_6BUTTON_PAD, &PicoOpt, 0x020, 0, 0, 1, 1 },
|
||||
{ "Turbo rate", MB_RANGE, MA_CTRL_TURBO_RATE, ¤tConfig.turbo_rate, 0, 1, 30, 1, 1 },
|
||||
{ "Done", MB_NONE, MA_CTRL_DONE, NULL, 0, 0, 0, 1, 0 },
|
||||
};
|
||||
|
||||
#define CTRLOPT_ENTRY_COUNT (sizeof(ctrlopt_entries) / sizeof(ctrlopt_entries[0]))
|
||||
const int ctrlopt_entry_count = CTRLOPT_ENTRY_COUNT;
|
||||
|
||||
static void draw_kc_sel(int menu_sel)
|
||||
{
|
||||
int tl_x = 25+40, tl_y = 60, y;
|
||||
|
@ -769,10 +752,7 @@ static void draw_kc_sel(int menu_sel)
|
|||
menu_draw_begin(1);
|
||||
menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 138);
|
||||
|
||||
text_out16(tl_x, y, "Player 1");
|
||||
text_out16(tl_x, (y+=10), "Player 2");
|
||||
text_out16(tl_x, (y+=10), "Emulator controls");
|
||||
text_out16(tl_x, (y+=10), "Done");
|
||||
me_draw(ctrlopt_entries, ctrlopt_entry_count, tl_x, tl_y, NULL, NULL);
|
||||
|
||||
menu_draw_end();
|
||||
}
|
||||
|
@ -795,23 +775,27 @@ me_bind_action emuctrl_actions[] =
|
|||
|
||||
static void kc_sel_loop(void)
|
||||
{
|
||||
int menu_sel = 3, menu_sel_max = 3;
|
||||
int menu_sel = 5, menu_sel_max = 5;
|
||||
unsigned long inp = 0;
|
||||
int is_6button = currentConfig.PicoOpt & 0x020;
|
||||
menu_id selected_id;
|
||||
|
||||
while (1)
|
||||
{
|
||||
draw_kc_sel(menu_sel);
|
||||
inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_PLAY|BTN_STOP);
|
||||
selected_id = me_index2id(ctrlopt_entries, CTRLOPT_ENTRY_COUNT, menu_sel);
|
||||
if (inp & (BTN_LEFT|BTN_RIGHT)) // multi choise
|
||||
me_process(ctrlopt_entries, CTRLOPT_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 0);
|
||||
if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
|
||||
if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
|
||||
if (inp & BTN_PLAY) {
|
||||
switch (menu_sel) {
|
||||
case 0: key_config_loop(me_ctrl_actions, is_6button ? 12 : 8, 0); return;
|
||||
case 1: key_config_loop(me_ctrl_actions, is_6button ? 12 : 8, 1); return;
|
||||
case 2: key_config_loop(emuctrl_actions,
|
||||
sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]) - 1, -1); return;
|
||||
case 3: if (!rom_loaded) emu_WriteConfig(0); return;
|
||||
int is_6button = currentConfig.PicoOpt & 0x020;
|
||||
switch (selected_id) {
|
||||
case MA_CTRL_PLAYER1: key_config_loop(me_ctrl_actions, is_6button ? 15 : 11, 0); return;
|
||||
case MA_CTRL_PLAYER2: key_config_loop(me_ctrl_actions, is_6button ? 15 : 11, 1); return;
|
||||
case MA_CTRL_EMU: key_config_loop(emuctrl_actions,
|
||||
sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]) - 1, -1); return;
|
||||
case MA_CTRL_DONE: if (!rom_loaded) emu_WriteConfig(0); return;
|
||||
default: return;
|
||||
}
|
||||
}
|
||||
|
@ -1043,14 +1027,13 @@ static void amenu_loop_options(void)
|
|||
menu_entry opt_entries[] =
|
||||
{
|
||||
{ NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1 },
|
||||
{ "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x080, 0, 0, 0, 1 },
|
||||
{ "Scanline mode (faster)", MB_ONOFF, MA_OPT_INTERLACED, ¤tConfig.EmuOpt, 0x4000, 0, 0, 1 },
|
||||
{ "Scale low res mode", MB_ONOFF, MA_OPT_SCALING, ¤tConfig.scaling, 0x0001, 0, 3, 1 },
|
||||
{ "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, ¤tConfig.PicoOpt, 0x0080, 0, 0, 1 },
|
||||
{ "Show FPS", MB_ONOFF, MA_OPT_SHOW_FPS, ¤tConfig.EmuOpt, 0x0002, 0, 0, 1 },
|
||||
{ NULL, MB_RANGE, MA_OPT_FRAMESKIP, ¤tConfig.Frameskip, 0, -1, 16, 1 },
|
||||
{ "Enable sound", MB_ONOFF, MA_OPT_ENABLE_SOUND, ¤tConfig.EmuOpt, 0x0004, 0, 0, 1 },
|
||||
{ NULL, MB_NONE, MA_OPT_SOUND_QUALITY, NULL, 0, 0, 0, 1 },
|
||||
{ "6 button pad", MB_ONOFF, MA_OPT_6BUTTON_PAD, ¤tConfig.PicoOpt, 0x0020, 0, 0, 1 },
|
||||
{ NULL, MB_NONE, MA_OPT_REGION, NULL, 0, 0, 0, 1 },
|
||||
{ "Use SRAM/BRAM savestates", MB_ONOFF, MA_OPT_SRAM_STATES, ¤tConfig.EmuOpt, 0x0001, 0, 0, 1 },
|
||||
{ NULL, MB_NONE, MA_OPT_CONFIRM_STATES,NULL, 0, 0, 0, 1 },
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue