X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=542abf5c7516a56e270e6eb1f3d41e38ac271111;hb=fa5e045bdc817112c1abf19e65e2d3481d51c48a;hp=f8b4e65e3b3a1232b753bf9999635edb4605a827;hpb=e31266dd116b6bea59ce3f2036feeb6725c45a72;p=libpicofe.git

diff --git a/common/emu.c b/common/emu.c
index f8b4e65..542abf5 100644
--- a/common/emu.c
+++ b/common/emu.c
@@ -15,7 +15,6 @@
 #include "fonts.h"
 #include "lprintf.h"
 #include "config.h"
-#include "common.h"
 #include "plat.h"
 
 #include <pico/pico_int.h>
@@ -36,7 +35,6 @@ currentConfig_t currentConfig, defaultConfig;
 char noticeMsg[64] = { 0, };
 int state_slot = 0;
 int config_slot = 0, config_slot_current = 0;
-int kb_combo_keys = 0, kb_combo_acts = 0;	// keys and actions which need button combos
 int pico_inp_mode = 0;
 int engineState = PGS_Menu;
 
@@ -129,9 +127,9 @@ int emu_findBios(int region, char **bios_file)
 		if (bios_file) *bios_file = bios_path;
 		return 1;
 	} else {
-		sprintf(menuErrorMsg, "no %s BIOS files found, read docs",
+		sprintf(bios_path, "no %s BIOS files found, read docs",
 			region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
-		lprintf("%s\n", menuErrorMsg);
+		me_update_msg(bios_path);
 		return 0;
 	}
 }
@@ -307,7 +305,7 @@ int emu_ReloadRom(char *rom_fname)
 
 	// detect wrong extensions
 	if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz
-		sprintf(menuErrorMsg, "Not a ROM/CD selected.");
+		me_update_msg("Not a ROM/CD selected.");
 		return 0;
 	}
 
@@ -324,32 +322,32 @@ int emu_ReloadRom(char *rom_fname)
 		int dummy;
 		FILE *movie_file = fopen(rom_fname, "rb");
 		if(!movie_file) {
-			sprintf(menuErrorMsg, "Failed to open movie.");
+			me_update_msg("Failed to open movie.");
 			return 0;
 		}
 		fseek(movie_file, 0, SEEK_END);
 		movie_size = ftell(movie_file);
 		fseek(movie_file, 0, SEEK_SET);
 		if(movie_size < 64+3) {
-			sprintf(menuErrorMsg, "Invalid GMV file.");
+			me_update_msg("Invalid GMV file.");
 			fclose(movie_file);
 			return 0;
 		}
 		movie_data = malloc(movie_size);
 		if(movie_data == NULL) {
-			sprintf(menuErrorMsg, "low memory.");
+			me_update_msg("low memory.");
 			fclose(movie_file);
 			return 0;
 		}
 		fread(movie_data, 1, movie_size, movie_file);
 		fclose(movie_file);
 		if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {
-			sprintf(menuErrorMsg, "Invalid GMV file.");
+			me_update_msg("Invalid GMV file.");
 			return 0;
 		}
 		dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname);
 		if (!dummy) {
-			sprintf(menuErrorMsg, "Could't find a ROM for movie.");
+			me_update_msg("Could't find a ROM for movie.");
 			return 0;
 		}
 		get_ext(rom_fname, ext);
@@ -361,7 +359,7 @@ int emu_ReloadRom(char *rom_fname)
 		PicoPatchLoad(rom_fname);
 		dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname);
 		if (!dummy) {
-			sprintf(menuErrorMsg, "Could't find a ROM to patch.");
+			me_update_msg("Could't find a ROM to patch.");
 			return 0;
 		}
 		get_ext(rom_fname, ext);
@@ -401,12 +399,12 @@ int emu_ReloadRom(char *rom_fname)
 
 	rom = pm_open(used_rom_name);
 	if (!rom) {
-		sprintf(menuErrorMsg, "Failed to open ROM/CD image");
+		me_update_msg("Failed to open ROM/CD image");
 		goto fail;
 	}
 
 	if (cd_state < 0) {
-		sprintf(menuErrorMsg, "Invalid CD image");
+		me_update_msg("Invalid CD image");
 		goto fail;
 	}
 
@@ -416,10 +414,9 @@ int emu_ReloadRom(char *rom_fname)
 	rom_loaded = 0;
 
 	if ( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {
-		if      (ret == 2) sprintf(menuErrorMsg, "Out of memory");
-		else if (ret == 3) sprintf(menuErrorMsg, "Read failed");
-		else               sprintf(menuErrorMsg, "PicoCartLoad() failed.");
-		lprintf("%s\n", menuErrorMsg);
+		if      (ret == 2) me_update_msg("Out of memory");
+		else if (ret == 3) me_update_msg("Read failed");
+		else               me_update_msg("PicoCartLoad() failed.");
 		goto fail2;
 	}
 	pm_close(rom);
@@ -429,7 +426,7 @@ int emu_ReloadRom(char *rom_fname)
 	if (rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||
 	  ((*(unsigned char *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) {
 		if (rom_data) free(rom_data);
-		sprintf(menuErrorMsg, "Not a ROM selected.");
+		me_update_msg("Not a ROM selected.");
 		goto fail2;
 	}
 
@@ -443,7 +440,7 @@ int emu_ReloadRom(char *rom_fname)
 
 	lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
 	if (PicoCartInsert(rom_data, rom_size)) {
-		sprintf(menuErrorMsg, "Failed to load ROM.");
+		me_update_msg("Failed to load ROM.");
 		goto fail2;
 	}
 
@@ -451,8 +448,7 @@ int emu_ReloadRom(char *rom_fname)
 	if (cd_state != CIT_NOT_CD) {
 		ret = Insert_CD(rom_fname, cd_state);
 		if (ret != 0) {
-			sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");
-			lprintf("%s\n", menuErrorMsg);
+			me_update_msg("Insert_CD() failed, invalid CD image?");
 			goto fail2;
 		}
 	}
@@ -634,13 +630,7 @@ int emu_ReadConfig(int game, int no_defaults)
 	if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100;
 #endif
 	if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50;
-#ifdef __GP2X__
-	// if volume keys are unbound, bind them to volume control
-	if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) {
-		currentConfig.KeyBinds[23] = 1<<29; // vol up
-		currentConfig.KeyBinds[22] = 1<<30; // vol down
-	}
-#endif
+
 	if (ret == 0) config_slot_current = config_slot;
 	return (ret == 0);
 }
@@ -717,54 +707,6 @@ mk_text_out(emu_textOut16, unsigned short, 0xffff)
 
 #undef mk_text_out
 
-#ifdef PSP
-#define MAX_COMBO_KEY 23
-#else
-#define MAX_COMBO_KEY 31
-#endif
-
-// FIXME
-void emu_findKeyBindCombos(void)
-{
-	int act, u;
-
-	// find out which keys and actions are combos
-	kb_combo_keys = kb_combo_acts = 0;
-	for (act = 0; act < 32; act++)
-	{
-		int keyc = 0, keyc2 = 0;
-		if (act == 16 || act == 17) continue; // player2 flag
-		if (act > 17)
-		{
-			for (u = 0; u <= MAX_COMBO_KEY; u++)
-				if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
-		}
-		else
-		{
-			for (u = 0; u <= MAX_COMBO_KEY; u++)
-				if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1
-					(currentConfig.KeyBinds[u] & (1 << act))) keyc++;
-			for (u = 0; u <= MAX_COMBO_KEY; u++)
-				if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2
-					(currentConfig.KeyBinds[u] & (1 << act))) keyc2++;
-			if (keyc2 > keyc) keyc = keyc2;
-		}
-		if (keyc > 1)
-		{
-			// loop again and mark those keys and actions as combo
-			for (u = 0; u <= MAX_COMBO_KEY; u++)
-			{
-				if (currentConfig.KeyBinds[u] & (1 << act)) {
-					kb_combo_keys |= 1 << u;
-					kb_combo_acts |= 1 << act;
-				}
-			}
-		}
-	}
-
-	// printf("combo keys/acts: %08x %08x\n", kb_combo_keys, kb_combo_acts);
-}
-
 
 void emu_updateMovie(void)
 {