-// (c) Copyright 2006-2007 notaz, All rights reserved.\r
+// (c) Copyright 2006-2009 notaz, All rights reserved.\r
// Free for non-commercial use.\r
\r
// For commercial use, separate licencing terms must be obtained.\r
#include <pico/pico_int.h>\r
#include <pico/patch.h>\r
#include <pico/cd/cue.h>\r
-#include <zlib/zlib.h>\r
\r
\r
#define STATUS_MSG_TIMEOUT 2000\r
// valid CD image, check for BIOS..\r
\r
// we need to have config loaded at this point\r
- ret = emu_read_config(1, 1);\r
- if (!ret) emu_read_config(0, 1);\r
+ ret = emu_read_config(1, 0);\r
+ if (!ret) emu_read_config(0, 0);\r
cfg_loaded = 1;\r
\r
if (PicoRegionOverride) {\r
if (!(PicoAHW & PAHW_MCD))\r
memcpy(id_header, rom_data + 0x100, sizeof(id_header));\r
if (!cfg_loaded) {\r
- ret = emu_read_config(1, 1);\r
- if (!ret) emu_read_config(0, 1);\r
+ ret = emu_read_config(1, 0);\r
+ if (!ret) emu_read_config(0, 0);\r
}\r
\r
lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
emu_status_msg(Pico.m.pal ? "PAL SYSTEM / 50 FPS" : "NTSC SYSTEM / 60 FPS");\r
}\r
\r
+ strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1);\r
+ rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;\r
+ rom_loaded = 1;\r
+\r
// load SRAM for this ROM\r
if (currentConfig.EmuOpt & EOPT_EN_SRAM)\r
emu_save_load_game(1, 1);\r
\r
- strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1);\r
- rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;\r
- rom_loaded = 1;\r
return 1;\r
\r
fail2:\r
char cfg[512];\r
int ret;\r
\r
+ if (!no_defaults)\r
+ emu_set_defconfig();\r
+\r
if (!game)\r
{\r
- if (!no_defaults)\r
- emu_set_defconfig();\r
make_config_cfg(cfg);\r
ret = config_readsect(cfg, NULL);\r
}\r
// read global config, and apply game_def.cfg on top\r
make_config_cfg(cfg);\r
config_readsect(cfg, NULL);\r
- ret = config_readsect("game_def.cfg", sect);\r
+ emu_make_path(cfg, "game_def.cfg", sizeof(cfg));\r
+ ret = config_readsect(cfg, sect);\r
}\r
\r
if (ret == 0)\r
}\r
}\r
\r
-\r
-static size_t gzRead2(void *p, size_t _size, size_t _n, void *file)\r
-{\r
- return gzread(file, p, _n);\r
-}\r
-\r
-\r
-static size_t gzWrite2(void *p, size_t _size, size_t _n, void *file)\r
-{\r
- return gzwrite(file, p, _n);\r
-}\r
-\r
static int try_ropen_file(const char *fname)\r
{\r
FILE *f;\r
\r
if (is_sram)\r
{\r
- romfname_ext(saveFname, (PicoAHW&1) ? "brm"PATH_SEP : "srm"PATH_SEP, (PicoAHW&1) ? ".brm" : ".srm");\r
+ romfname_ext(saveFname, (PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP,\r
+ (PicoAHW & PAHW_MCD) ? ".brm" : ".srm");\r
if (load) {\r
if (try_ropen_file(saveFname)) return saveFname;\r
// try in current dir..\r
return emu_get_save_fname(1, 0, slot) ? 1 : 0;\r
}\r
\r
-void emu_setSaveStateCbs(int gz)\r
-{\r
- if (gz) {\r
- areaRead = gzRead2;\r
- areaWrite = gzWrite2;\r
- areaEof = (areaeof *) gzeof;\r
- areaSeek = (areaseek *) gzseek;\r
- areaClose = (areaclose *) gzclose;\r
- } else {\r
- areaRead = (arearw *) fread;\r
- areaWrite = (arearw *) fwrite;\r
- areaEof = (areaeof *) feof;\r
- areaSeek = (areaseek *) fseek;\r
- areaClose = (areaclose *) fclose;\r
- }\r
-}\r
-\r
int emu_save_load_game(int load, int sram)\r
{\r
int ret = 0;\r
}\r
else\r
{\r
- void *PmovFile = NULL;\r
- if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0)\r
- {\r
- if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {\r
- emu_setSaveStateCbs(1);\r
- if (!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);\r
- }\r
- }\r
- else\r
- {\r
- if( (PmovFile = fopen(saveFname, load ? "rb" : "wb")) ) {\r
- emu_setSaveStateCbs(0);\r
- }\r
- }\r
- if(PmovFile) {\r
- ret = PmovState(load ? 6 : 5, PmovFile);\r
- areaClose(PmovFile);\r
- PmovFile = 0;\r
- if (load) Pico.m.dirtyPal=1;\r
+ ret = PicoState(saveFname, !load);\r
+ if (!ret) {\r
#ifndef NO_SYNC\r
- else sync();\r
+ if (!load) sync();\r
#endif\r
- }\r
- else ret = -1;\r
- if (!ret)\r
emu_status_msg(load ? "STATE LOADED" : "STATE SAVED");\r
- else\r
- {\r
+ } else {\r
emu_status_msg(load ? "LOAD FAILED" : "SAVE FAILED");\r
ret = -1;\r
}\r
}\r
}\r
\r
-static void emu_msg_tray_open(void)\r
+static void emu_tray_open(void)\r
{\r
- emu_status_msg("CD tray opened");\r
+ engineState = PGS_TrayMenu;\r
+}\r
+\r
+static void emu_tray_close(void)\r
+{\r
+ emu_status_msg("CD tray closed.");\r
}\r
\r
void emu_reset_game(void)\r
\r
PicoInit();\r
PicoMessage = plat_status_msg_busy_next;\r
- PicoMCDopenTray = emu_msg_tray_open;\r
- PicoMCDcloseTray = menu_loop_tray;\r
+ PicoMCDopenTray = emu_tray_open;\r
+ PicoMCDcloseTray = emu_tray_close;\r
}\r
\r
void emu_finish(void)\r
if (PicoAHW & PAHW_MCD)\r
PicoCDBufferInit();\r
\r
- if (currentConfig.EmuOpt & EOPT_PSYNC)\r
- plat_video_wait_vsync();\r
-\r
pemu_loop_prep();\r
\r
timestamp_fps = get_ticks();\r
\r
frames_done = frames_shown = pframes_done = 0;\r
\r
+ plat_video_wait_vsync();\r
+\r
/* loop with resync every 1 sec. */\r
while (engineState == PGS_Running)\r
{\r
if (diff < diff_lim)\r
{\r
// we are too fast\r
- if (currentConfig.EmuOpt & EOPT_PSYNC) {\r
- if (diff_lim - diff > target_frametime/2)\r
- plat_wait_till_us(timestamp_base + target_frametime/4);\r
+ plat_wait_till_us(timestamp_base + diff_lim - target_frametime / 4);\r
+ if (currentConfig.EmuOpt & EOPT_VSYNC)\r
plat_video_wait_vsync();\r
- } else\r
- plat_wait_till_us(timestamp_base + diff_lim);\r
}\r
}\r
\r