#include "emu.h"\r
#include "menu.h"\r
#include "usbjoy.h"\r
-#include "../common/arm_utils.h"\r
+#include "../common/emu.h"\r
#include "../common/menu.h"\r
+#include "../common/arm_utils.h"\r
#include "../common/readpng.h"\r
#include "version.h"\r
\r
#error "need d_type for file browser\r
#endif\r
\r
-extern char romFileName[PATH_MAX];\r
-extern char *rom_data;\r
extern int mmuhack_status;\r
-extern int state_slot;\r
-extern int config_slot, config_slot_current;\r
\r
static const char *gp2xKeyNames[] = {\r
"UP", "???", "LEFT", "???", "DOWN", "???", "RIGHT", "???",\r
"???", "???", "???", "PUSH", "???", "???", "???", "???"\r
};\r
\r
-char menuErrorMsg[40] = {0, };\r
-\r
static void menu_darken_bg(void *dst, int pixels, int darker);\r
static void menu_prepare_bg(int use_game_bg);\r
\r
\r
for (slot = 0; slot < 10; slot++)\r
{\r
- if (emu_check_save_file(slot))\r
+ if (emu_checkSaveFile(slot))\r
{\r
state_slot_flags |= 1 << slot;\r
}\r
\r
if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) {\r
file = gzopen(fname, "rb");\r
- emu_set_save_cbs(1);\r
+ emu_setSaveStateCbs(1);\r
} else {\r
file = fopen(fname, "rb");\r
- emu_set_save_cbs(0);\r
+ emu_setSaveStateCbs(0);\r
}\r
\r
if (file) {\r
areaClose(file);\r
}\r
\r
- emu_forced_frame();\r
+ emu_forcedFrame();\r
menu_prepare_bg(1);\r
\r
memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
}\r
}\r
\r
+ // limit..\r
+ strkeys[20] = 0;\r
+\r
return strkeys;\r
}\r
\r
-static void unbind_action(int action)\r
+static void unbind_action(int action, int pl_idx, int joy)\r
{\r
int i, u;\r
\r
- for (i = 0; i < 32; i++)\r
- currentConfig.KeyBinds[i] &= ~action;\r
- for (u = 0; u < 4; u++)\r
- for (i = 0; i < 32; i++)\r
- currentConfig.JoyBinds[u][i] &= ~action;\r
+ if (joy <= 0)\r
+ {\r
+ for (i = 0; i < 32; i++) {\r
+ if (pl_idx >= 0 && (currentConfig.KeyBinds[i]&0x30000) != (pl_idx<<16)) continue;\r
+ currentConfig.KeyBinds[i] &= ~action;\r
+ }\r
+ }\r
+ if (joy < 0)\r
+ {\r
+ for (u = 0; u < 4; u++)\r
+ for (i = 0; i < 32; i++) {\r
+ if (pl_idx >= 0 && (currentConfig.JoyBinds[u][i]&0x30000) != (pl_idx<<16)) continue;\r
+ currentConfig.JoyBinds[u][i] &= ~action;\r
+ }\r
+ }\r
+ else if (joy > 0)\r
+ {\r
+ for (i = 0; i < 32; i++) {\r
+ if (pl_idx >= 0 && (currentConfig.JoyBinds[joy-1][i]&0x30000) != (pl_idx<<16)) continue;\r
+ currentConfig.JoyBinds[joy-1][i] &= ~action;\r
+ }\r
+ }\r
}\r
\r
-static int count_bound_keys(int action, int joy)\r
+static int count_bound_keys(int action, int pl_idx, int joy)\r
{\r
int i, keys = 0;\r
\r
if (joy)\r
{\r
- for (i = 0; i < 32; i++)\r
+ for (i = 0; i < 32; i++) {\r
+ if (pl_idx >= 0 && (currentConfig.JoyBinds[joy-1][i]&0x30000) != (pl_idx<<16)) continue;\r
if (currentConfig.JoyBinds[joy-1][i] & action) keys++;\r
+ }\r
}\r
else\r
{\r
- for (i = 0; i < 32; i++)\r
+ for (i = 0; i < 32; i++) {\r
+ if (pl_idx >= 0 && (currentConfig.KeyBinds[i]&0x30000) != (pl_idx<<16)) continue;\r
if (currentConfig.KeyBinds[i] & action) keys++;\r
+ }\r
}\r
return keys;\r
}\r
gp2x_pd_clone_buffer2();\r
if (player_idx >= 0) {\r
text_out16(80, 20, "Player %i controls", player_idx + 1);\r
- x = 100;\r
+ x = 80;\r
} else {\r
text_out16(80, 20, "Emulator controls");\r
x = 40;\r
}\r
// if we are here, we want to bind/unbind something\r
if ((inp & GP2X_SELECT) && !prev_select)\r
- unbind_action(opts[sel].mask);\r
+ unbind_action(opts[sel].mask, player_idx, -1);\r
prev_select = inp & GP2X_SELECT;\r
inp &= CONFIGURABLE_KEYS;\r
inp &= ~GP2X_SELECT;\r
for (i = 0; i < 32; i++)\r
if (inp & (1 << i)) {\r
- if (count_bound_keys(opts[sel].mask, 0) >= 2)\r
+ if (count_bound_keys(opts[sel].mask, player_idx, 0) >= 2)\r
currentConfig.KeyBinds[i] &= ~opts[sel].mask; // allow to unbind only\r
else currentConfig.KeyBinds[i] ^= opts[sel].mask;\r
- if (player_idx >= 0) {\r
+ if (player_idx >= 0 && (currentConfig.KeyBinds[i] & opts[sel].mask)) {\r
currentConfig.KeyBinds[i] &= ~(3 << 16);\r
currentConfig.KeyBinds[i] |= player_idx << 16;\r
}\r
{\r
for (i = 0; i < 32; i++)\r
if (inp & (1 << i)) {\r
- if (count_bound_keys(opts[sel].mask, joy) >= 1) // disallow combos for usbjoy\r
- currentConfig.JoyBinds[joy-1][i] &= ~opts[sel].mask;\r
- else currentConfig.JoyBinds[joy-1][i] ^= opts[sel].mask;\r
- if (player_idx >= 0) {\r
- currentConfig.JoyBinds[joy-1][i] &= ~(3 << 16);\r
- currentConfig.JoyBinds[joy-1][i] |= player_idx << 16;\r
+ int *bind = ¤tConfig.JoyBinds[joy-1][i];\r
+ if ((*bind & opts[sel].mask) && (player_idx < 0 || player_idx == ((*bind>>16)&3)))\r
+ currentConfig.JoyBinds[joy-1][i] &= ~opts[sel].mask;\r
+ else {\r
+ // override\r
+ unbind_action(opts[sel].mask, player_idx, joy);\r
+ *bind = opts[sel].mask;\r
+ if (player_idx >= 0) *bind |= player_idx << 16;\r
}\r
}\r
}\r
menu_id selected_id;\r
char *bios, *p;\r
\r
- if (find_bios(4, &bios)) { // US\r
+ if (emu_findBios(4, &bios)) { // US\r
for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
strncpy(bios_names.us, p, sizeof(bios_names.us)); bios_names.us[sizeof(bios_names.us)-1] = 0;\r
} else strcpy(bios_names.us, "NOT FOUND");\r
\r
- if (find_bios(8, &bios)) { // EU\r
+ if (emu_findBios(8, &bios)) { // EU\r
for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
strncpy(bios_names.eu, p, sizeof(bios_names.eu)); bios_names.eu[sizeof(bios_names.eu)-1] = 0;\r
} else strcpy(bios_names.eu, "NOT FOUND");\r
\r
- if (find_bios(1, &bios)) { // JP\r
+ if (emu_findBios(1, &bios)) { // JP\r
for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
strncpy(bios_names.jp, p, sizeof(bios_names.jp)); bios_names.jp[sizeof(bios_names.jp)-1] = 0;\r
} else strcpy(bios_names.jp, "NOT FOUND");\r
if (inp & GP2X_START) { // BIOS testers\r
switch (selected_id) {\r
case MA_CDOPT_TESTBIOS_USA:\r
- if (find_bios(4, &bios)) { // test US\r
+ if (emu_findBios(4, &bios)) { // test US\r
strcpy(romFileName, bios);\r
engineState = PGS_ReloadRom;\r
return;\r
}\r
break;\r
case MA_CDOPT_TESTBIOS_EUR:\r
- if (find_bios(8, &bios)) { // test EU\r
+ if (emu_findBios(8, &bios)) { // test EU\r
strcpy(romFileName, bios);\r
engineState = PGS_ReloadRom;\r
return;\r
}\r
break;\r
case MA_CDOPT_TESTBIOS_JAP:\r
- if (find_bios(1, &bios)) { // test JP\r
+ if (emu_findBios(1, &bios)) { // test JP\r
strcpy(romFileName, bios);\r
engineState = PGS_ReloadRom;\r
return;\r
PicoRegionOverride = currentConfig.PicoRegion;\r
if (!(PicoOpt & 0x20)) {\r
// unbind XYZ MODE, just in case\r
- unbind_action(0xf00);\r
+ unbind_action(0xf00, -1, -1);\r
}\r
- scaling_update();\r
}\r
\r
static int menu_loop_options(void)\r
text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");\r
y = tl_y;\r
text_out16(tl_x, y, "Credits:");\r
- text_out16(tl_x, (y+=10), "Dave: Cyclone 68000 core,");\r
+ text_out16(tl_x, (y+=10), "fDave: Cyclone 68000 core,");\r
text_out16(tl_x, (y+=10), " base code of PicoDrive");\r
text_out16(tl_x, (y+=10), "Reesy & FluBBa: DrZ80 core");\r
text_out16(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores");\r
selfname = romsel_loop(curr_path);\r
if (selfname) {\r
int ret = -1, cd_type;\r
- cd_type = emu_cd_check(NULL);\r
+ cd_type = emu_cdCheck(NULL);\r
if (cd_type > 0)\r
ret = Insert_CD(romFileName, cd_type == 2);\r
if (ret != 0) {\r
notaz.gp2x.de / picodrive.git / blobdiff