X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=common%2Fmenu.c;h=7bf133c59a6e837654ad8cd9088f540cd5eedf65;hb=45deb4099e6d20780376e6425d43107120a10bc6;hp=412dbc2cdabdeaad2e036ce46133be978ccd883a;hpb=93c18cb44bf9794c7c9bc93411c68880723320d1;p=libpicofe.git

diff --git a/common/menu.c b/common/menu.c
index 412dbc2..7bf133c 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -262,14 +262,17 @@ void menu_init(void)
 	}
 
 	// load custom font and selector (stored as 1st symbol in font table)
-	readpng(menu_font_data, "skin/font.png", READPNG_FONT);
+	emu_make_path(buff, "skin/font.png", sizeof(buff));
+	readpng(menu_font_data, buff, READPNG_FONT);
 	// default selector symbol is '>'
 	memcpy(menu_font_data, menu_font_data + ((int)'>') * me_mfont_w * me_mfont_h / 2,
 		me_mfont_w * me_mfont_h / 2);
-	readpng(menu_font_data, "skin/selector.png", READPNG_SELECTOR);
+	emu_make_path(buff, "skin/selector.png", sizeof(buff));
+	readpng(menu_font_data, buff, READPNG_SELECTOR);
 
 	// load custom colors
-	f = fopen("skin/skin.txt", "r");
+	emu_make_path(buff, "skin/skin.txt", sizeof(buff));
+	f = fopen(buff, "r");
 	if (f != NULL)
 	{
 		lprintf("found skin.txt\n");
@@ -328,7 +331,7 @@ static void me_draw(const menu_entry *entries, int sel)
 {
 	const menu_entry *ent;
 	int x, y, w = 0, h = 0;
-	int offs, opt_offs = 27 * me_mfont_w;
+	int offs, col2_offs = 27 * me_mfont_w;
 	const char *name;
 	int asel = 0;
 	int i, n;
@@ -353,9 +356,9 @@ static void me_draw(const menu_entry *entries, int sel)
 
 		if (ent->beh != MB_NONE)
 		{
-			if (wt > opt_offs)
-				opt_offs = wt + me_mfont_w;
-			wt = opt_offs;
+			if (wt > col2_offs)
+				col2_offs = wt + me_mfont_w;
+			wt = col2_offs;
 
 			switch (ent->beh) {
 			case MB_NONE: break;
@@ -415,10 +418,10 @@ static void me_draw(const menu_entry *entries, int sel)
 		case MB_NONE:
 			break;
 		case MB_OPT_ONOFF:
-			text_out16(x + opt_offs, y, (*(int *)ent->var & ent->mask) ? "ON" : "OFF");
+			text_out16(x + col2_offs, y, (*(int *)ent->var & ent->mask) ? "ON" : "OFF");
 			break;
 		case MB_OPT_RANGE:
-			text_out16(x + opt_offs, y, "%i", *(int *)ent->var);
+			text_out16(x + col2_offs, y, "%i", *(int *)ent->var);
 			break;
 		case MB_OPT_CUSTOM:
 		case MB_OPT_CUSTONOFF:
@@ -428,7 +431,7 @@ static void me_draw(const menu_entry *entries, int sel)
 			if (ent->generate_name)
 				name = ent->generate_name(ent->id, &offs);
 			if (name != NULL)
-				text_out16(x + opt_offs + offs * me_mfont_w, y, "%s", name);
+				text_out16(x + col2_offs + offs * me_mfont_w, y, "%s", name);
 			break;
 		}
 
@@ -949,7 +952,7 @@ static void state_check_slots(void)
 	state_slot_flags = 0;
 
 	for (slot = 0; slot < 10; slot++) {
-		if (emu_checkSaveFile(slot))
+		if (emu_check_save_file(slot))
 			state_slot_flags |= 1 << slot;
 	}
 }
@@ -962,7 +965,7 @@ static void draw_savestate_bg(int slot)
 	void *tmp_vram, *file;
 	char *fname;
 
-	fname = emu_GetSaveFName(1, 0, slot);
+	fname = emu_get_save_fname(1, 0, slot);
 	if (!fname) return;
 
 	tmp_vram = malloc(sizeof(Pico.vram));
@@ -1067,7 +1070,7 @@ static int menu_loop_savestate(int is_loading)
 		if (inp & PBTN_MOK) { // save/load
 			if (menu_sel < 10) {
 				state_slot = menu_sel;
-				if (emu_SaveLoadGame(is_loading, 0)) {
+				if (emu_save_load_game(is_loading, 0)) {
 					me_update_msg(is_loading ? "Load failed" : "Save failed");
 					return 0;
 				}
@@ -1084,8 +1087,8 @@ static int menu_loop_savestate(int is_loading)
 
 static char *action_binds(int player_idx, int action_mask, int dev_id)
 {
+	int k, count, can_combo, type;
 	const int *binds;
-	int k, count;
 
 	static_buff[0] = 0;
 
@@ -1094,21 +1097,30 @@ static char *action_binds(int player_idx, int action_mask, int dev_id)
 		return static_buff;
 
 	count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);
+	can_combo = in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS);
+
+	type = IN_BINDTYPE_EMU;
+	if (player_idx >= 0) {
+		can_combo = 0;
+		type = IN_BINDTYPE_PLAYER12;
+	}
+	if (player_idx == 1)
+		action_mask <<= 16;
+
 	for (k = 0; k < count; k++)
 	{
 		const char *xname;
 		int len;
-		if (!(binds[k] & action_mask))
-			continue;
 
-		if (player_idx >= 0 && ((binds[k] >> 16) & 3) != player_idx)
+		if (!(binds[IN_BIND_OFFS(k, type)] & action_mask))
 			continue;
 
 		xname = in_get_key_name(dev_id, k);
 		len = strlen(static_buff);
 		if (len) {
-			strncat(static_buff, " + ", sizeof(static_buff) - len - 1);
-			len += 3;
+			strncat(static_buff, can_combo ? " + " : ", ",
+				sizeof(static_buff) - len - 1);
+			len += can_combo ? 3 : 2;
 		}
 		strncat(static_buff, xname, sizeof(static_buff) - len - 1);
 	}
@@ -1116,7 +1128,7 @@ static char *action_binds(int player_idx, int action_mask, int dev_id)
 	return static_buff;
 }
 
-static int count_bound_keys(int dev_id, int action_mask, int player_idx)
+static int count_bound_keys(int dev_id, int action_mask, int bindtype)
 {
 	const int *binds;
 	int k, keys = 0;
@@ -1129,13 +1141,8 @@ static int count_bound_keys(int dev_id, int action_mask, int player_idx)
 	count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);
 	for (k = 0; k < count; k++)
 	{
-		if (!(binds[k] & action_mask))
-			continue;
-
-		if (player_idx >= 0 && ((binds[k] >> 16) & 3) != player_idx)
-			continue;
-
-		keys++;
+		if (binds[IN_BIND_OFFS(k, bindtype)] & action_mask)
+			keys++;
 	}
 
 	return keys;
@@ -1191,7 +1198,8 @@ static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_
 static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_idx)
 {
 	int i, sel = 0, menu_sel_max = opt_cnt - 1;
-	int dev_id, dev_count, kc, is_down, mkey, unbind;
+	int dev_id, dev_count, kc, is_down, mkey;
+	int unbind, bindtype, mask;
 
 	for (i = 0, dev_id = -1, dev_count = 0; i < IN_MAX_DEVS; i++) {
 		if (in_get_dev_name(i, 1, 0) != NULL) {
@@ -1244,19 +1252,20 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
 		for (is_down = 1; is_down; )
 			kc = in_update_keycode(&dev_id, &is_down, -1);
 
-		i = count_bound_keys(dev_id, opts[sel].mask, player_idx);
+		bindtype = player_idx >= 0 ? IN_BINDTYPE_PLAYER12 : IN_BINDTYPE_EMU;
+		mask = opts[sel].mask;
+		if (player_idx == 1)
+			mask <<= 16;
+
+		i = count_bound_keys(dev_id, mask, bindtype);
 		unbind = (i > 0);
 
 		/* allow combos if device supports them */
-		if (i == 1 && in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))
+		if (i == 1 && bindtype == IN_BINDTYPE_EMU &&
+				in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))
 			unbind = 0;
 
-		in_bind_key(dev_id, kc, opts[sel].mask, unbind);
-		if (player_idx >= 0) {
-			/* FIXME */
-			in_bind_key(dev_id, kc, 3 << 16, 1);
-			in_bind_key(dev_id, kc, player_idx << 16, 0);
-		}
+		in_bind_key(dev_id, kc, bindtype, mask, unbind);
 	}
 }
 
@@ -1280,10 +1289,6 @@ me_bind_action me_ctrl_actions[15] =
 	{ "Z      ", 0x0100 }
 };
 
-// player2_flag, reserved, ?, ?,
-// ?, ?, fast forward, menu
-// "NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",
-// "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"
 me_bind_action emuctrl_actions[] =
 {
 	{ "Load State       ", PEV_STATE_LOAD },
@@ -1418,7 +1423,7 @@ static int menu_loop_cd_options(menu_id id, int keys)
 
 static menu_entry e_menu_adv_options[] =
 {
-	mee_onoff     ("SRAM/BRAM saves",          MA_OPT_SRAM_STATES,    currentConfig.EmuOpt, EOPT_USE_SRAM),
+	mee_onoff     ("SRAM/BRAM saves",          MA_OPT_SRAM_STATES,    currentConfig.EmuOpt, EOPT_EN_SRAM),
 	mee_onoff     ("Disable sprite limit",     MA_OPT2_NO_SPRITE_LIM, PicoOpt, POPT_DIS_SPRITE_LIM),
 	mee_onoff     ("Use second CPU for sound", MA_OPT_ARM940_SOUND,   PicoOpt, POPT_EXT_FM),
 	mee_onoff     ("Emulate Z80",              MA_OPT2_ENABLE_Z80,    PicoOpt, POPT_EN_Z80),
@@ -1587,14 +1592,14 @@ static int mh_saveloadcfg(menu_id id, int keys)
 	switch (id) {
 	case MA_OPT_SAVECFG:
 	case MA_OPT_SAVECFG_GAME:
-		if (emu_WriteConfig(id == MA_OPT_SAVECFG_GAME ? 1 : 0))
+		if (emu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0))
 			me_update_msg("config saved");
 		else
 			me_update_msg("failed to write config");
 		break;
 	case MA_OPT_LOADCFG:
-		ret = emu_ReadConfig(1, 1);
-		if (!ret) ret = emu_ReadConfig(0, 1);
+		ret = emu_read_config(1, 1);
+		if (!ret) ret = emu_read_config(0, 1);
 		if (ret)  me_update_msg("config loaded");
 		else      me_update_msg("failed to load config");
 		break;
@@ -1985,7 +1990,7 @@ static int mh_tray_load_cd(menu_id id, int keys)
 	if (ret_name == NULL)
 		return 0;
 
-	cd_type = emu_cdCheck(NULL, ret_name);
+	cd_type = emu_cd_check(NULL, ret_name);
 	if (cd_type != CIT_NOT_CD)
 		ret = Insert_CD(ret_name, cd_type);
 	if (ret != 0) {