X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.h;h=2c8de5cd921413f6ce88de5044e150e674127c03;hb=fa5e045bdc817112c1abf19e65e2d3481d51c48a;hp=15643b9da2e56aadc0e634c9ae8dd5c599a1fdcb;hpb=24b24674aedbdcb4432ab2ed823c3d9c97852da4;p=libpicofe.git

diff --git a/common/emu.h b/common/emu.h
index 15643b9..2c8de5c 100644
--- a/common/emu.h
+++ b/common/emu.h
@@ -9,16 +9,30 @@
 extern "C" {
 #endif
 
+extern void *g_screen_ptr;
+
+#if SCREEN_SIZE_FIXED
+#define g_screen_width  SCREEN_WIDTH
+#define g_screen_height SCREEN_HEIGHT
+#else
+extern int g_screen_width;
+extern int g_screen_height;
+#endif
+
+
 #define EOPT_USE_SRAM     (1<<0)
 #define EOPT_SHOW_FPS     (1<<1)
 #define EOPT_EN_SOUND     (1<<2)
 #define EOPT_GZIP_SAVES   (1<<3)
+#define EOPT_MMUHACK      (1<<4)
 #define EOPT_NO_AUTOSVCFG (1<<5)
+#define EOPT_RAM_TIMINGS  (1<<8)
+#define EOPT_PSYNC        (1<<13)
 
 typedef struct _currentConfig_t {
 	// 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
+					// mmuhack, 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
 					// vsync_mode, show_clock, no_frame_limitter
@@ -29,12 +43,8 @@ typedef struct _currentConfig_t {
 	int s_PicoCDBuffers;
 	int Frameskip;
 	int CPUclock;
-	int KeyBinds[PLAT_MAX_KEYS];
 	int volume;
 	int gamma;
-#if PLAT_HAVE_JOY
-	int JoyBinds[4][32];
-#endif
 	int scaling;  // gp2x: 0=center, 1=hscale, 2=hvscale, 3=hsoftscale; psp: bilinear filtering
 	int rotation; // for UIQ
 	float scale; // psp: screen scale
@@ -50,11 +60,13 @@ extern char noticeMsg[64];
 extern int state_slot;
 extern int config_slot, config_slot_current;
 extern unsigned char *movie_data;
-extern char loadedRomFName[512];		// last loaded ROM filename
-extern int kb_combo_keys, kb_combo_acts;	// keys and actions which need button combos
 extern int pico_inp_mode;
 
+extern char rom_fname_reload[512];		// ROM to try loading on next PGS_ReloadRom
+extern char rom_fname_loaded[512];		// currently loaded ROM filename
+
 // engine states
+extern int engineState;
 enum TPicoGameState {
 	PGS_Paused = 1,
 	PGS_Running,
@@ -83,7 +95,6 @@ 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_getGameName(char *str150);
-void  emu_findKeyBindCombos(void);
 void  emu_changeFastForward(int set_on);
 void  emu_RunEventsPico(unsigned int events);
 void  emu_DoTurbo(int *pad, int acts);