X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.h;h=d118e5bc86bd570bd4149b6d4c92649a2a1fcb16;hb=2b395ee02a212090ac5d499e8e915373d57185e0;hp=f8261575db3540d508cfe86e7662b3e4cbac02f4;hpb=f3dc5a3a95396bd5b156678769b4434c123a9880;p=libpicofe.git

diff --git a/common/emu.h b/common/emu.h
index f826157..d118e5b 100644
--- a/common/emu.h
+++ b/common/emu.h
@@ -4,33 +4,38 @@
 // For commercial use, separate licencing terms must be obtained.
 
 typedef struct {
-	char lastRomFile[512];
+	// char lastRomFile[512];
 	int EmuOpt;		// LSb->MSb: use_sram, show_fps, enable_sound, gzip_saves,
 					// squidgehack, no_save_cfg_on_exit, <unused>, 16_bit_mode
 					// craigix_ram, confirm_save, show_cd_leds, confirm_load
 					// A_SNs_gamma, perfect_vsync, giz_scanlines, giz_dblbuff
-	int PicoOpt;  // used for config saving only, see Pico.h
-	int PsndRate; // ditto
-	int PicoRegion; // ditto
+					// vsync_mode, show_clock, no_frame_limitter
+	int s_PicoOpt;		// for old cfg files only
+	int s_PsndRate;
+	int s_PicoRegion;
 	int Frameskip;
 	int CPUclock;
 	int KeyBinds[32];
 	int volume;
 	int gamma;
 	int JoyBinds[4][32];
-	int PicoAutoRgnOrder;
-	int PicoCDBuffers;
-	int scaling; // 0=center, 1=hscale, 2=hvscale, 3=hsoftscale
+	int s_PicoAutoRgnOrder;
+	int s_PicoCDBuffers;
+	int scaling; // gp2x: 0=center, 1=hscale, 2=hvscale, 3=hsoftscale; psp: bilinear filtering
+	float scale; // psp: screen scale
+	float hscale32, hscale40; // psp: horizontal scale
+	int gamma2;  // psp: black level
 } currentConfig_t;
 
-
-extern currentConfig_t currentConfig;
+extern currentConfig_t currentConfig, defaultConfig;
 extern char *PicoConfigFile;
-extern unsigned char *rom_data;
+extern int rom_loaded;
 extern char noticeMsg[64];
 extern int state_slot;
 extern int config_slot, config_slot_current;
 extern unsigned char *movie_data;
+extern char lastRomFile[512];
+extern int kb_combo_keys, kb_combo_acts;	// keys and actions which need button combos
 
 
 int   emu_ReloadRom(void);
@@ -45,4 +50,8 @@ int   emu_cdCheck(int *pregion);
 int   emu_findBios(int region, char **bios_file);
 void  emu_textOut8 (int x, int y, const char *text);
 void  emu_textOut16(int x, int y, const char *text);
+char *emu_makeRomId(void);
+void  emu_findKeyBindCombos(void);
 
+extern const char * const keyNames[];
+void  emu_prepareDefaultConfig(void);