screen ptr/size unification, major cleanups

[libpicofe.git] / common / emu.h

diff --git a/common/emu.h b/common/emu.h
index e05f365..91921c9 100644 (file)
--- a/common/emu.h
+++ b/common/emu.h
@@ -9,10 +9,22 @@
 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_NO_AUTOSVCFG (1<<5)
 
 typedef struct _currentConfig_t {
        // char lastRomFile[512];
@@ -49,15 +61,32 @@ 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,
+       PGS_Quit,
+       PGS_KeyConfig,
+       PGS_ReloadRom,
+       PGS_Menu,
+       PGS_RestartRun,
+       PGS_Suspending,         /* PSP */
+       PGS_SuspendWake,        /* PSP */
+};
+
 
 int   emu_ReloadRom(char *rom_fname);
 int   emu_SaveLoadGame(int load, int sram);
 int   emu_ReadConfig(int game, int no_defaults);
 int   emu_WriteConfig(int game);
+void  emu_writelrom(void);
 char *emu_GetSaveFName(int load, int is_sram, int slot);
 int   emu_checkSaveFile(int slot);
 void  emu_setSaveStateCbs(int gz);
@@ -76,15 +105,6 @@ void  emu_packConfig(void);
 void  emu_unpackConfig(void);
 void  emu_shutdownMCD(void);
 
-/* not in common */
-extern const char * const keyNames[];
-void  emu_prepareDefaultConfig(void);
-void  emu_platformDebugCat(char *str);
-void  emu_forcedFrame(int opts);
-void  emu_startSound(void);
-void  emu_endSound(void);
-void  emu_waitSound(void);
-
 #ifdef __cplusplus
 } // extern "C"
 #endif