Only in src: .svn Only in src\build: .svn Only in src\build: file2str.obj Only in src\emu: .svn Only in src\emu\audio: .svn Only in src\emu\cpu: .svn Only in src\emu\cpu\adsp2100: .svn Only in src\emu\cpu\alph8201: .svn Only in src\emu\cpu\apexc: .svn Only in src\emu\cpu\arm: .svn Only in src\emu\cpu\arm7: .svn diff -cr src\emu\cpu\arm7\arm7exec.c e:\mame0118s\src\emu\cpu\arm7\arm7exec.c *** src\emu\cpu\arm7\arm7exec.c Sat Sep 01 09:05:23 2007 --- e:\mame0118s\src\emu\cpu\arm7\arm7exec.c Sat Sep 01 06:03:34 2007 *************** *** 26,32 **** /****************************************************************************** * Notes: * This file contains the code to run during the CPU EXECUTE METHOD. ! * It has been split into its own file (from the arm7core.c) so it can be * directly compiled into any cpu core that wishes to use it. * * It should be included as follows in your cpu core: --- 26,32 ---- /****************************************************************************** * Notes: * This file contains the code to run during the CPU EXECUTE METHOD. ! * It has been split into it's own file (from the arm7core.c) so it can be * directly compiled into any cpu core that wishes to use it. * * It should be included as follows in your cpu core: Only in src\emu\cpu\asap: .svn Only in src\emu\cpu\ccpu: .svn Only in src\emu\cpu\cdp1802: .svn Only in src\emu\cpu\cop400: .svn Only in src\emu\cpu\cp1610: .svn Only in src\emu\cpu\dsp32: .svn Only in src\emu\cpu\dsp56k: .svn Only in src\emu\cpu\e132xs: .svn Only in src\emu\cpu\f8: .svn Only in src\emu\cpu\g65816: .svn Only in src\emu\cpu\h6280: .svn Only in src\emu\cpu\h83002: .svn Only in src\emu\cpu\hd6309: .svn Only in src\emu\cpu\i386: .svn Only in src\emu\cpu\i8039: .svn Only in src\emu\cpu\i8051: .svn Only in src\emu\cpu\i8085: .svn Only in src\emu\cpu\i86: .svn Only in src\emu\cpu\i8x41: .svn Only in src\emu\cpu\i960: .svn Only in src\emu\cpu\jaguar: .svn Only in src\emu\cpu\konami: .svn Only in src\emu\cpu\lh5801: .svn Only in src\emu\cpu\m37710: .svn Only in src\emu\cpu\m6502: .svn Only in src\emu\cpu\m6800: .svn Only in src\emu\cpu\m68000: .svn Only in src\emu\cpu\m68000: m68kmake.exe Only in src\emu\cpu\m68000: m68kmake.obj Only in src\emu\cpu\m68000: m68kops.c Only in src\emu\cpu\m68000: m68kops.h Only in src\emu\cpu\m6805: .svn Only in src\emu\cpu\m6809: .svn Only in src\emu\cpu\mb86233: .svn Only in src\emu\cpu\mb88xx: .svn Only in src\emu\cpu\mc68hc11: .svn Only in src\emu\cpu\minx: .svn Only in src\emu\cpu\mips: .svn Only in src\emu\cpu\nec: .svn Only in src\emu\cpu\pdp1: .svn diff -cr src\emu\cpu\pdp1\tx0.c e:\mame0118s\src\emu\cpu\pdp1\tx0.c *** src\emu\cpu\pdp1\tx0.c Sun Sep 02 13:47:01 2007 --- e:\mame0118s\src\emu\cpu\pdp1\tx0.c Sun Feb 18 16:47:38 2007 *************** *** 7,12 **** --- 7,13 ---- Raphael Nabet 2004 */ + #include "cpuintrf.h" #include "debugger.h" #include "tx0.h" Only in src\emu\cpu\pic16c5x: .svn Only in src\emu\cpu\powerpc: .svn Only in src\emu\cpu\rsp: .svn Only in src\emu\cpu\s2650: .svn Only in src\emu\cpu\saturn: .svn Only in src\emu\cpu\sc61860: .svn Only in src\emu\cpu\se3208: .svn Only in src\emu\cpu\sh2: .svn Only in src\emu\cpu\sh4: .svn Only in src\emu\cpu\sharc: .svn Only in src\emu\cpu\sm8500: .svn Only in src\emu\cpu\spc700: .svn Only in src\emu\cpu\ssp1610: .svn Only in src\emu\cpu\t11: .svn Only in src\emu\cpu\tlcs90: .svn Only in src\emu\cpu\tms32010: .svn Only in src\emu\cpu\tms32025: .svn Only in src\emu\cpu\tms32031: .svn Only in src\emu\cpu\tms32051: .svn Only in src\emu\cpu\tms34010: .svn Only in src\emu\cpu\tms7000: .svn Only in src\emu\cpu\tms9900: .svn Only in src\emu\cpu\upd7810: .svn Only in src\emu\cpu\v30mz: .svn Only in src\emu\cpu\v60: .svn Only in src\emu\cpu\v810: .svn Only in src\emu\cpu\z180: .svn Only in src\emu\cpu\z80: .svn Only in src\emu\cpu\z8000: .svn Only in src\emu\cpu\z80gb: .svn diff -cr src\emu\cpuexec.c e:\mame0118s\src\emu\cpuexec.c *** src\emu\cpuexec.c Mon Sep 03 07:08:40 2007 --- e:\mame0118s\src\emu\cpuexec.c Mon Jul 16 01:23:34 2007 *************** *** 26,31 **** --- 26,32 ---- * Debug logging * *************************************/ + #define VERBOSE 0 #if VERBOSE Only in src\emu\debug: .svn Only in src\emu\drivers: .svn diff -cr src\emu\emuopts.h e:\mame0118s\src\emu\emuopts.h *** src\emu\emuopts.h Sun Sep 02 07:21:24 2007 --- e:\mame0118s\src\emu\emuopts.h Sat Sep 01 06:03:36 2007 *************** *** 137,144 **** #define OPTION_BIOS "bios" #define OPTION_CHEAT "cheat" #define OPTION_SKIP_GAMEINFO "skip_gameinfo" ! #define OPTIONS_SKIP_WARNINGS "skip_warnings" ! #define OPTIONS_SKIP_DISCLAIMER "skip_disclaimer" /*************************************************************************** GLOBALS --- 137,144 ---- #define OPTION_BIOS "bios" #define OPTION_CHEAT "cheat" #define OPTION_SKIP_GAMEINFO "skip_gameinfo" ! ! /*************************************************************************** GLOBALS diff -cr src\emu\fileio.c e:\mame0118s\src\emu\fileio.c *** src\emu\fileio.c Mon Sep 03 08:29:00 2007 --- e:\mame0118s\src\emu\fileio.c Wed Aug 01 22:00:58 2007 *************** *** 246,254 **** /* if the path is absolute, null out the search path */ if (searchpath != NULL && osd_is_absolute_path(searchpath)) - { searchpath = NULL; - } /* determine the maximum length of a composed filename, plus some extra space for .zip extensions */ path_iterator_init(&iterator, opts, searchpath); --- 246,252 ---- diff -cr src\emu\inptport.c e:\mame0118s\src\emu\inptport.c *** src\emu\inptport.c Sun Sep 02 08:33:21 2007 --- e:\mame0118s\src\emu\inptport.c Sat Sep 01 06:03:39 2007 *************** *** 386,392 **** { INPUT_STRING_Flip_Screen, "Flip Screen" }, { INPUT_STRING_Service_Mode, "Service Mode" }, { INPUT_STRING_Pause, "Pause" }, - { INPUT_STRING_Test, "Test" }, { INPUT_STRING_Tilt, "Tilt" }, { INPUT_STRING_Version, "Version" }, --- 386,391 ---- *************** *** 965,972 **** INPUT_PORT_DIGITAL_DEF( 0, IPG_UI, UI_DEBUG_BREAK, "Break in Debugger", SEQ_DEF_1(KEYCODE_TILDE) ) INPUT_PORT_DIGITAL_DEF( 0, IPG_UI, UI_CONFIGURE, "Config Menu", SEQ_DEF_1(KEYCODE_TAB) ) INPUT_PORT_DIGITAL_DEF( 0, IPG_UI, UI_PAUSE, "Pause", SEQ_DEF_1(KEYCODE_P) ) - INPUT_PORT_DIGITAL_DEF( 0, IPG_UI, UI_QUEST_RESTART,"Quest restart", SEQ_DEF_1(KEYCODE_R) ) - INPUT_PORT_DIGITAL_DEF( 0, IPG_UI, UI_RESET_MACHINE, "Reset Game", SEQ_DEF_2(KEYCODE_F3, KEYCODE_LSHIFT) ) INPUT_PORT_DIGITAL_DEF( 0, IPG_UI, UI_SOFT_RESET, "Soft Reset", SEQ_DEF_3(KEYCODE_F3, SEQCODE_NOT, KEYCODE_LSHIFT) ) INPUT_PORT_DIGITAL_DEF( 0, IPG_UI, UI_SHOW_GFX, "Show Gfx", SEQ_DEF_1(KEYCODE_F4) ) --- 964,969 ---- diff -cr src\emu\inptport.h e:\mame0118s\src\emu\inptport.h *** src\emu\inptport.h Sun Sep 02 08:32:51 2007 --- e:\mame0118s\src\emu\inptport.h Sat Sep 01 06:03:39 2007 *************** *** 234,240 **** IPT_UI_ON_SCREEN_DISPLAY, IPT_UI_DEBUG_BREAK, IPT_UI_PAUSE, - IPT_UI_QUEST_RESTART, IPT_UI_RESET_MACHINE, IPT_UI_SOFT_RESET, IPT_UI_SHOW_GFX, --- 234,239 ---- *************** *** 274,280 **** IPT_UI_EDIT_CHEAT, IPT_UI_RELOAD_CHEAT, IPT_UI_TOGGLE_CROSSHAIR, - /* additional OSD-specified UI port types (up to 16) */ IPT_OSD_1, --- 273,278 ---- Only in src\emu\layout: .svn Only in src\emu\layout: dualhovu.lh Only in src\emu\layout: dualhsxs.lh Only in src\emu\layout: dualhuov.lh Only in src\emu\layout: ho20ffff.lh Only in src\emu\layout: ho2eff2e.lh Only in src\emu\layout: ho4f893d.lh Only in src\emu\layout: ho88ffff.lh Only in src\emu\layout: hoa0a0ff.lh Only in src\emu\layout: hoffe457.lh Only in src\emu\layout: hoffff20.lh Only in src\emu\layout: horizont.lh Only in src\emu\layout: snap.lh Only in src\emu\layout: triphsxs.lh Only in src\emu\layout: vertical.lh Only in src\emu\layout: voffff20.lh Only in src\emu\machine: .svn diff -cr src\emu\mame.c e:\mame0118s\src\emu\mame.c *** src\emu\mame.c Sun Sep 16 18:58:35 2007 --- e:\mame0118s\src\emu\mame.c Sat Sep 01 06:03:36 2007 *************** *** 91,99 **** #include #include #include - #include "quest.h" - extern GlobalQuestInfo* GlobalQ; /*************************************************************************** --- 91,97 ---- *************** *** 246,252 **** extern int mame_validitychecks(const game_driver *driver); ! int parse_ini_file(const char *name); static running_machine *create_machine(const game_driver *driver); static void reset_machine(running_machine *machine); --- 244,250 ---- extern int mame_validitychecks(const game_driver *driver); ! static int parse_ini_file(const char *name); static running_machine *create_machine(const game_driver *driver); static void reset_machine(running_machine *machine); *************** *** 270,426 **** /*------------------------------------------------- mame_execute - run the core emulation -------------------------------------------------*/ - int firstrun = TRUE; - - int mame_execute_driver(game_driver* driver) - { - int exit_pending = FALSE; - int error = MAMERR_NONE; - running_machine* machine; - mame_private* mame; - callback_item* cb; - // - if (driver) - { - started_empty = FALSE; - } - - /* create the machine structure and driver */ - machine = create_machine(driver); - reset_machine(machine); - mame = machine->mame_data; - - /* start in the "pre-init phase" */ - mame->current_phase = MAME_PHASE_PREINIT; - - /* looooong term: remove this */ - Machine = machine; - - init_resource_tracking(); - - /* use setjmp/longjmp for deep error recovery */ - mame->fatal_error_jmpbuf_valid = TRUE; - error = setjmp(mame->fatal_error_jmpbuf); - if (error == 0) - { - int settingsloaded; - - /* move to the init phase */ - mame->current_phase = MAME_PHASE_INIT; - - /* start tracking resources for real */ - begin_resource_tracking(); - - /* if we have a logfile, set up the callback */ - mame->logerror_callback_list = NULL; - if (options_get_bool(mame_options(), OPTION_LOG)) - { - file_error filerr = mame_fopen(SEARCHPATH_DEBUGLOG, "error.log", OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS, &mame->logfile); - assert_always(filerr == FILERR_NONE, "unable to open log file"); - add_logerror_callback(machine, logfile_callback); - } - - /* then finish setting up our local machine */ - init_machine(machine); - - /* load the configuration settings and NVRAM */ - settingsloaded = config_load_settings(); - nvram_load(); - - /* display the startup screens */ - ui_display_startup_screens(firstrun, !settingsloaded); - firstrun = FALSE; - - /* start resource tracking; note that soft_reset assumes it can */ - /* call end_resource_tracking followed by begin_resource_tracking */ - /* to clear out resources allocated between resets */ - begin_resource_tracking(); - - - /* perform a soft reset -- this takes us to the running phase */ - soft_reset(machine, 0); - - /* run the CPUs until a reset or exit */ - mame->hard_reset_pending = FALSE; - while ((!mame->hard_reset_pending && !mame->exit_pending) || mame->saveload_pending_file != NULL) - { - profiler_mark(PROFILER_EXTRA); - if (!mame->paused) - { - /* execute CPUs if not paused */ - cpuexec_timeslice(); - } - else - { - /* otherwise, just pump video updates through */ - video_frame_update(); - } - /* handle save/load */ - if (mame->saveload_schedule_callback) - { - (*mame->saveload_schedule_callback)(machine); - } - - profiler_mark(PROFILER_END); - } - - /* and out via the exit phase */ - mame->current_phase = MAME_PHASE_EXIT; - - /* stop tracking resources at this level */ - end_resource_tracking(); - - /* save the NVRAM and configuration */ - nvram_save(); - config_save_settings(); - } - mame->fatal_error_jmpbuf_valid = FALSE; - - /* call all exit callbacks registered */ - for (cb = mame->exit_callback_list; cb; cb = cb->next) - { - (*cb->func.exit)(machine); - } - - /* close all inner resource tracking */ - exit_resource_tracking(); - - /* close the logfile */ - if (mame->logfile != NULL) - { - mame_fclose(mame->logfile); - } - - /* free our callback lists */ - free_callback_list(&mame->exit_callback_list); - free_callback_list(&mame->pause_callback_list); - free_callback_list(&mame->reset_callback_list); - free_callback_list(&mame->frame_callback_list); - - /* grab data from the MAME structure before it goes away */ - if (mame->new_driver_pending != NULL) - { - options_set_string(mame_options(), OPTION_GAMENAME, mame->new_driver_pending->name, OPTION_PRIORITY_CMDLINE); - firstrun = TRUE; - } - /* destroy the machine */ - destroy_machine(machine); - return 1; - } int mame_execute(void) { int exit_pending = FALSE; int error = MAMERR_NONE; int firstgame = TRUE; /* loop across multiple hard resets */ while (error == MAMERR_NONE && !exit_pending) { const game_driver *driver; ! mame_private *mame; ! astring *gamename; /* convert the specified gamename to a driver */ --- 268,288 ---- /*------------------------------------------------- mame_execute - run the core emulation -------------------------------------------------*/ int mame_execute(void) { int exit_pending = FALSE; int error = MAMERR_NONE; int firstgame = TRUE; + int firstrun = TRUE; /* loop across multiple hard resets */ while (error == MAMERR_NONE && !exit_pending) { const game_driver *driver; ! running_machine *machine; mame_private *mame; ! callback_item *cb; astring *gamename; /* convert the specified gamename to a driver */ *************** *** 445,455 **** options_revert(mame_options(), OPTION_PRIORITY_INI); mame_parse_ini_files(mame_options(), driver); ! // Execute this driver: ! mame_execute_driver(driver); ! exit_pending = mame->exit_pending; } /* return an error */ --- 307,426 ---- options_revert(mame_options(), OPTION_PRIORITY_INI); mame_parse_ini_files(mame_options(), driver); ! /* create the machine structure and driver */ ! machine = create_machine(driver); ! reset_machine(machine); ! mame = machine->mame_data; ! ! /* start in the "pre-init phase" */ ! mame->current_phase = MAME_PHASE_PREINIT; ! ! /* looooong term: remove this */ ! Machine = machine; ! ! init_resource_tracking(); ! ! /* use setjmp/longjmp for deep error recovery */ ! mame->fatal_error_jmpbuf_valid = TRUE; ! error = setjmp(mame->fatal_error_jmpbuf); ! if (error == 0) ! { ! int settingsloaded; ! ! /* move to the init phase */ ! mame->current_phase = MAME_PHASE_INIT; ! ! /* start tracking resources for real */ ! begin_resource_tracking(); ! ! /* if we have a logfile, set up the callback */ ! mame->logerror_callback_list = NULL; ! if (options_get_bool(mame_options(), OPTION_LOG)) ! { ! file_error filerr = mame_fopen(SEARCHPATH_DEBUGLOG, "error.log", OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS, &mame->logfile); ! assert_always(filerr == FILERR_NONE, "unable to open log file"); ! add_logerror_callback(machine, logfile_callback); ! } ! ! /* then finish setting up our local machine */ ! init_machine(machine); ! ! /* load the configuration settings and NVRAM */ ! settingsloaded = config_load_settings(); ! nvram_load(); ! ! /* display the startup screens */ ! ui_display_startup_screens(firstrun, !settingsloaded); ! firstrun = FALSE; ! ! /* start resource tracking; note that soft_reset assumes it can */ ! /* call end_resource_tracking followed by begin_resource_tracking */ ! /* to clear out resources allocated between resets */ ! begin_resource_tracking(); ! ! /* perform a soft reset -- this takes us to the running phase */ ! soft_reset(machine, 0); ! ! /* run the CPUs until a reset or exit */ ! mame->hard_reset_pending = FALSE; ! while ((!mame->hard_reset_pending && !mame->exit_pending) || mame->saveload_pending_file != NULL) ! { ! profiler_mark(PROFILER_EXTRA); ! ! /* execute CPUs if not paused */ ! if (!mame->paused) ! cpuexec_timeslice(); ! ! /* otherwise, just pump video updates through */ ! else ! video_frame_update(); ! ! /* handle save/load */ ! if (mame->saveload_schedule_callback) ! (*mame->saveload_schedule_callback)(machine); ! ! profiler_mark(PROFILER_END); ! } ! ! /* and out via the exit phase */ ! mame->current_phase = MAME_PHASE_EXIT; ! ! /* stop tracking resources at this level */ ! end_resource_tracking(); ! ! /* save the NVRAM and configuration */ ! nvram_save(); ! config_save_settings(); ! } ! mame->fatal_error_jmpbuf_valid = FALSE; ! ! /* call all exit callbacks registered */ ! for (cb = mame->exit_callback_list; cb; cb = cb->next) ! (*cb->func.exit)(machine); ! ! /* close all inner resource tracking */ ! exit_resource_tracking(); ! ! /* close the logfile */ ! if (mame->logfile != NULL) ! mame_fclose(mame->logfile); ! ! /* free our callback lists */ ! free_callback_list(&mame->exit_callback_list); ! free_callback_list(&mame->pause_callback_list); ! free_callback_list(&mame->reset_callback_list); ! free_callback_list(&mame->frame_callback_list); ! ! /* grab data from the MAME structure before it goes away */ ! if (mame->new_driver_pending != NULL) ! { ! options_set_string(mame_options(), OPTION_GAMENAME, mame->new_driver_pending->name, OPTION_PRIORITY_CMDLINE); ! firstrun = TRUE; ! } exit_pending = mame->exit_pending; + /* destroy the machine */ + destroy_machine(machine); } /* return an error */ *************** *** 597,605 **** /* otherwise, exit for real */ else - { mame->exit_pending = TRUE; - } /* if we're autosaving on exit, schedule a save as well */ if (options_get_bool(mame_options(), OPTION_AUTOSAVE) && (machine->gamedrv->flags & GAME_SUPPORTS_SAVE)) --- 568,574 ---- *************** *** 678,708 **** void mame_schedule_load(running_machine *machine, const char *filename) { - char* CheckChar; - int FullPathFlag; mame_private *mame = machine->mame_data; ! /* free any existing request and allocate a copy of the requested name */ if (mame->saveload_pending_file != NULL) astring_free(mame->saveload_pending_file); ! ! // NF: If the requested name is a FULL PATH, then DON'T assemble a name! ! FullPathFlag = 0; ! for (CheckChar = filename; *CheckChar; CheckChar++) ! { ! if (*CheckChar == '\\' || *CheckChar == '/') ! { ! FullPathFlag = 1; ! } ! } ! if (FullPathFlag) ! { ! mame->saveload_pending_file = astring_cpyc(astring_alloc(), filename); ! } ! else ! { ! mame->saveload_pending_file = astring_assemble_4(astring_alloc(), machine->basename, PATH_SEPARATOR, filename, ".sta"); ! } /* note the start time and set a timer for the next timeslice to actually schedule it */ mame->saveload_schedule_callback = handle_load; --- 647,658 ---- void mame_schedule_load(running_machine *machine, const char *filename) { mame_private *mame = machine->mame_data; ! /* free any existing request and allocate a copy of the requested name */ if (mame->saveload_pending_file != NULL) astring_free(mame->saveload_pending_file); ! mame->saveload_pending_file = astring_assemble_4(astring_alloc(), machine->basename, PATH_SEPARATOR, filename, ".sta"); /* note the start time and set a timer for the next timeslice to actually schedule it */ mame->saveload_schedule_callback = handle_load; *************** *** 1329,1335 **** parse_ini_file - parse a single INI file -------------------------------------------------*/ ! int parse_ini_file(const char *name) { file_error filerr; mame_file *file; --- 1279,1285 ---- parse_ini_file - parse a single INI file -------------------------------------------------*/ ! static int parse_ini_file(const char *name) { file_error filerr; mame_file *file; *************** *** 1558,1567 **** /* initialize miscellaneous systems */ saveload_init(machine); if (options_get_bool(mame_options(), OPTION_CHEAT)) - { cheat_init(machine); - } - init_quests(machine); } --- 1508,1514 ---- *************** *** 1575,1581 **** mame_private *mame = machine->mame_data; callback_item *cb; - logerror("Soft reset\n"); /* temporarily in the reset phase */ --- 1522,1527 ---- *************** *** 1745,1760 **** handle_load - attempt to perform a load -------------------------------------------------*/ - extern mame_timer* QuestTimer; - static void handle_load(running_machine *machine) { mame_private *mame = machine->mame_data; file_error filerr; mame_file *file; - char* CheckChar; - int AbsolutePathFlag = 0; - mame_time QuestTimerPeriod; /* if no name, bail */ if (mame->saveload_pending_file == NULL) --- 1691,1701 ---- *************** *** 1770,1800 **** /* if more than a second has passed, we're probably screwed */ if (sub_mame_times(mame_timer_get_time(), mame->saveload_schedule_time).seconds > 0) { - printf("* DAMN YOU, ANONYMOUS TIMERS!\n"); // popmessage("Unable to load due to pending anonymous timers. See error.log for details."); goto cancel; } return; } ! // Extreme laziness: Assume paths containing \\ should not treated as ! // raw paths and not shunted through the "path iteration" business. ! for (CheckChar = astring_c(mame->saveload_pending_file); *CheckChar; CheckChar++) ! { ! if (*CheckChar == '\\') ! { ! AbsolutePathFlag = 1; ! } ! } ! /* open the file */ ! if (AbsolutePathFlag) ! { ! filerr = mame_fopen(NULL, astring_c(mame->saveload_pending_file), OPEN_FLAG_READ, &file); ! } ! else ! { ! filerr = mame_fopen(SEARCHPATH_STATE, astring_c(mame->saveload_pending_file), OPEN_FLAG_READ, &file); ! } if (filerr == FILERR_NONE) { /* start loading */ --- 1711,1724 ---- /* if more than a second has passed, we're probably screwed */ if (sub_mame_times(mame_timer_get_time(), mame->saveload_schedule_time).seconds > 0) { popmessage("Unable to load due to pending anonymous timers. See error.log for details."); goto cancel; } return; } ! /* open the file */ ! filerr = mame_fopen(SEARCHPATH_STATE, astring_c(mame->saveload_pending_file), OPEN_FLAG_READ, &file); if (filerr == FILERR_NONE) { /* start loading */ *************** *** 1825,1857 **** cpuintrf_pop_context(); } - QuestTimerPeriod = make_mame_time(0, Machine->screen[0].refresh); - mame_timer_adjust(QuestTimer, QuestTimerPeriod, 0, QuestTimerPeriod); /* finish and close */ state_save_load_finish(); ! if (!GlobalQ->CurrentQuest) ! { ! popmessage("State successfully loaded."); ! } } else - { popmessage("Error: Failed to load state"); - } mame_fclose(file); } else - { popmessage("Error: Failed to load state"); - } cancel: /* unschedule the load */ astring_free(mame->saveload_pending_file); mame->saveload_pending_file = NULL; mame->saveload_schedule_callback = NULL; - printf("-->Load complete\n"); // %%% } --- 1749,1771 ---- cpuintrf_pop_context(); } /* finish and close */ state_save_load_finish(); ! popmessage("State successfully loaded."); } else popmessage("Error: Failed to load state"); mame_fclose(file); } else popmessage("Error: Failed to load state"); cancel: /* unschedule the load */ astring_free(mame->saveload_pending_file); mame->saveload_pending_file = NULL; mame->saveload_schedule_callback = NULL; } Only in src\emu\sound: .svn diff -cr src\emu\state.c e:\mame0118s\src\emu\state.c *** src\emu\state.c Thu Sep 13 21:02:44 2007 --- e:\mame0118s\src\emu\state.c Mon Sep 03 08:32:17 2007 *************** *** 625,645 **** --- 625,650 ---- get_signature - compute the signature, which is a CRC over the structure of the data -------------------------------------------------*/ + static UINT32 get_signature(void) { ss_entry *entry; UINT32 crc = 0; + /* iterate over entries */ for (entry = ss_registry; entry; entry = entry->next) { UINT32 temp[2]; + /* add the entry name to the CRC */ crc = crc32(crc, (UINT8 *)astring_c(entry->name), astring_len(entry->name)); + /* add the type and size to the CRC */ temp[0] = LITTLE_ENDIANIZE_INT32(entry->typecount); temp[1] = LITTLE_ENDIANIZE_INT32(entry->typesize); crc = crc32(crc, (UINT8 *)&temp[0], 8); } + return crc; } *************** *** 664,669 **** --- 669,675 ---- errormsg("%sThis is not a " APPNAME " save file", error_prefix); return -1; } + /* check save state version */ if (header[8] != SAVE_VERSION) { *************** *** 841,846 **** --- 847,853 ---- ss_dump_array = malloc_or_die(ss_dump_size); ss_dump_file = file; mame_fread(ss_dump_file, ss_dump_array, ss_dump_size); + /* verify the header and report an error if it doesn't match */ if (validate_header(ss_dump_array, NULL, get_signature(), popmessage, "Error: ")) { *************** *** 880,896 **** /* iterate over entries with matching tags */ for (entry = ss_registry; entry; entry = entry->next) - { if (entry->tag == ss_current_tag) { memcpy(entry->data, ss_dump_array + entry->offset, entry->typesize * entry->typecount); if (need_convert && ss_conv[entry->typesize]) - { (*ss_conv[entry->typesize])(entry->data, entry->typecount); - } TRACE(logerror(" %s: %x..%x\n", astring_c(entry->name), entry->offset, entry->offset + entry->typesize * entry->typecount - 1)); } - } /* call the post-load functions */ TRACE(logerror(" calling post-load functions\n")); --- 887,899 ---- *************** *** 908,914 **** { TRACE(logerror("Finishing load\n")); - /* free memory and reset the global states */ free(ss_dump_array); ss_dump_array = NULL; --- 911,916 ---- diff -cr src\emu\timer.c e:\mame0118s\src\emu\timer.c *** src\emu\timer.c Thu Sep 13 21:05:26 2007 --- e:\mame0118s\src\emu\timer.c Tue Jul 31 00:44:46 2007 *************** *** 314,319 **** --- 314,320 ---- /* set the new global offset */ global_basetime = newbase; + LOG(("mame_timer_set_global_time: new=%.9f head->expire=%.9f\n", mame_time_to_double(newbase), mame_time_to_double(timer_head->expire))); /* now process any timers that are overdue */ *************** *** 392,403 **** /* find other timers that match our func name */ for (t = timer_head; t; t = t->next) - { if (!strcmp(t->func, timer->func)) - { count++; - } - } /* make up a name */ sprintf(buf, "timer.%s", timer->func); --- 393,400 ---- *************** *** 486,493 **** isn't primed yet -------------------------------------------------*/ ! INLINE mame_timer *_mame_timer_alloc_common(void (*callback)(running_machine *, int), void (*callback_ptr)(running_machine *, void *), void *param, ! const char *file, int line, const char *func, int temp) { mame_time time = get_current_time(); mame_timer *timer = timer_new(); --- 483,489 ---- isn't primed yet -------------------------------------------------*/ ! INLINE mame_timer *_mame_timer_alloc_common(void (*callback)(running_machine *, int), void (*callback_ptr)(running_machine *, void *), void *param, const char *file, int line, const char *func, int temp) { mame_time time = get_current_time(); mame_timer *timer = timer_new(); *************** *** 510,525 **** timer->expire = time_never; timer_list_insert(timer); ! /* if we're not temporary, register ourselves with the save state system */ if (!temp) { ! if (strcmp(func, "QuestTimerCallback")) ! { ! timer_register_save(timer); ! } ! restrack_register_object(OBJTYPE_TIMER, timer, 0, file, line); } ! /* return a handle */ return timer; } --- 506,518 ---- timer->expire = time_never; timer_list_insert(timer); ! /* if we're not temporary, register ourselve with the save state system */ if (!temp) { ! timer_register_save(timer); ! restrack_register_object(OBJTYPE_TIMER, timer, 0, file, line); } ! /* return a handle */ return timer; } *************** *** 528,544 **** { return _mame_timer_alloc_common(callback, NULL, NULL, file, line, func, FALSE); } - - // Allocate a timer that's NOT saved or loaded: - mame_timer* _mame_timer_alloc_temp(void (*callback)(running_machine *, int), const char *file, int line, const char *func) - { - mame_timer* Timer; - - Timer = _mame_timer_alloc_common(callback, NULL, NULL, file, line, func, TRUE); - Timer->temporary = 0; - return Timer; - } - mame_timer *_mame_timer_alloc_ptr(void (*callback_ptr)(running_machine *, void *), void *param, const char *file, int line, const char *func) { --- 521,526 ---- diff -cr src\emu\timer.h e:\mame0118s\src\emu\timer.h *** src\emu\timer.h Mon Sep 03 08:30:35 2007 --- e:\mame0118s\src\emu\timer.h Sat Sep 01 06:03:39 2007 *************** *** 65,71 **** /* macros that map all allocations to provide file/line/functions to the callee */ #define mame_timer_alloc(c) _mame_timer_alloc(c, __FILE__, __LINE__, #c) - #define mame_timer_alloc_temp(c) _mame_timer_alloc_temp(c, __FILE__, __LINE__, #c) #define mame_timer_alloc_ptr(c,p) _mame_timer_alloc_ptr(c, p, __FILE__, __LINE__, #c) #define mame_timer_pulse(e,p,c) _mame_timer_pulse(e, p, c, __FILE__, __LINE__, #c) #define mame_timer_pulse_ptr(e,p,c) _mame_timer_pulse_ptr(e, p, c, __FILE__, __LINE__, #c) --- 65,70 ---- *************** *** 123,129 **** mame_time mame_timer_next_fire_time(void); void mame_timer_set_global_time(mame_time newbase); mame_timer *_mame_timer_alloc(void (*callback)(running_machine *, int), const char *file, int line, const char *func); - mame_timer *_mame_timer_alloc_temp(void (*callback)(running_machine *, int), const char *file, int line, const char *func); mame_timer *_mame_timer_alloc_ptr(void (*callback)(running_machine *, void *), void *param, const char *file, int line, const char *func); void mame_timer_adjust(mame_timer *which, mame_time duration, INT32 param, mame_time period); void mame_timer_adjust_ptr(mame_timer *which, mame_time duration, mame_time period); --- 122,127 ---- diff -cr src\emu\ui.c e:\mame0118s\src\emu\ui.c *** src\emu\ui.c Mon Sep 03 07:08:40 2007 --- e:\mame0118s\src\emu\ui.c Tue Jul 31 02:21:04 2007 *************** *** 20,26 **** #include "uimenu.h" #include "uigfx.h" #include "uitext.h" - #include "quest.h" #ifdef MESS #include "mess.h" --- 20,25 ---- *************** *** 32,40 **** #include #include - #define ARGB_GOLD MAKE_ARGB(0xff, 200, 200, 0) - #define ARGB_SILVER MAKE_ARGB(0xff, 190, 190, 190) - #define ARGB_BRONZE MAKE_ARGB(0xff, 140, 120, 83) /*************************************************************************** --- 31,36 ---- *************** *** 119,125 **** static int display_rescale_message; static int allow_rescale; ! extern GlobalQuestInfo* GlobalQ; /*************************************************************************** --- 115,121 ---- static int display_rescale_message; static int allow_rescale; ! /*************************************************************************** *************** *** 321,334 **** #endif int str = options_get_int(mame_options(), OPTION_SECONDS_TO_RUN); int show_gameinfo = !options_get_bool(mame_options(), OPTION_SKIP_GAMEINFO); ! int show_warnings = !options_get_bool(mame_options(), OPTIONS_SKIP_WARNINGS); int state; - - if (options_get_bool(mame_options(), OPTIONS_SKIP_DISCLAIMER)) - { - show_disclaimer = FALSE; - } - printf("UI startup: %d, %d, %d\n", show_gameinfo, show_warnings, show_disclaimer); /* disable everything if we are using -str */ if (!first_time || (str > 0 && str < 60*5) || Machine->gamedrv == &driver_empty) --- 317,324 ---- #endif int str = options_get_int(mame_options(), OPTION_SECONDS_TO_RUN); int show_gameinfo = !options_get_bool(mame_options(), OPTION_SKIP_GAMEINFO); ! int show_warnings = TRUE; int state; /* disable everything if we are using -str */ if (!first_time || (str > 0 && str < 60*5) || Machine->gamedrv == &driver_empty) *************** *** 414,462 **** } } - void ShowQuestTimer() - { - static int TimeLeft; - static char TimeBuffer[64]; - // - if (GlobalQ->TimeLimitGold) - { - TimeLeft = (GlobalQ->TimeLimitGold - GlobalQ->ElapsedTime) / 60; - if (TimeLeft >= 0) - { - sprintf(TimeBuffer, "%d", TimeLeft); - ui_draw_text_full(TimeBuffer, 0.0f, 0.0f, 1.0f, - JUSTIFY_RIGHT, WRAP_WORD, DRAW_OPAQUE, - ARGB_GOLD, ARGB_BLACK, NULL, NULL); - return; - } - } - if (GlobalQ->TimeLimitSilver) - { - TimeLeft = (GlobalQ->TimeLimitSilver - GlobalQ->ElapsedTime) / 60; - if (TimeLeft >= 0) - { - sprintf(TimeBuffer, "%d", TimeLeft); - ui_draw_text_full(TimeBuffer, 0.0f, 0.0f, 1.0f, - JUSTIFY_RIGHT, WRAP_WORD, DRAW_OPAQUE, - ARGB_SILVER, ARGB_BLACK, NULL, NULL); - return; - } - } - if (GlobalQ->TimeLimitBronze) - { - TimeLeft = (GlobalQ->TimeLimitBronze - GlobalQ->ElapsedTime) / 60; - if (TimeLeft >= 0) - { - sprintf(TimeBuffer, "%d", TimeLeft); - ui_draw_text_full(TimeBuffer, 0.0f, 0.0f, 1.0f, - JUSTIFY_RIGHT, WRAP_WORD, DRAW_OPAQUE, - ARGB_BRONZE, ARGB_BLACK, NULL, NULL); - return; - } - } - } - /*------------------------------------------------- ui_update_and_render - update the UI and --- 404,409 ---- *************** *** 1288,1298 **** else showfps_end = 0; - if (GlobalQ->CurrentQuest) - { - ShowQuestTimer(); - } - /* draw the profiler if visible */ if (show_profiler) ui_draw_text_full(profiler_get_text(), 0.0f, 0.0f, 1.0f, JUSTIFY_LEFT, WRAP_WORD, DRAW_OPAQUE, ARGB_WHITE, ARGB_BLACK, NULL, NULL); --- 1235,1240 ---- *************** *** 1321,1329 **** /* if the user pressed ESC, stop the emulation */ if (input_ui_pressed(IPT_UI_CANCEL)) - { mame_schedule_exit(Machine); - } /* turn on menus if requested */ if (input_ui_pressed(IPT_UI_CONFIGURE)) --- 1263,1269 ---- *************** *** 1360,1384 **** /* handle a load state request */ if (input_ui_pressed(IPT_UI_LOAD_STATE)) { ! if (GlobalQ->CurrentQuest && GlobalQ->State > QUEST_STATE_ABORT) ! { ! printf("No loading in quests!"); ! } ! else ! { ! mame_pause(Machine, TRUE); ! return ui_set_handler(handler_load_save, LOADSAVE_LOAD); ! } ! } ! // Restart a quest: ! if (input_ui_pressed(IPT_UI_QUEST_RESTART)) ! { ! if (GlobalQ->CurrentQuest) ! { ! RestartQuest(); ! mame_schedule_load(Machine, GlobalQ->SaveFilePath); ! } ! } /* handle a save snapshot request */ if (input_ui_pressed(IPT_UI_SNAPSHOT)) --- 1300,1308 ---- /* handle a load state request */ if (input_ui_pressed(IPT_UI_LOAD_STATE)) { ! mame_pause(Machine, TRUE); ! return ui_set_handler(handler_load_save, LOADSAVE_LOAD); ! } /* handle a save snapshot request */ if (input_ui_pressed(IPT_UI_SNAPSHOT)) *************** *** 1545,1553 **** /* if we're not in the middle of anything, skip */ if (state == LOADSAVE_NONE) - { return 0; - } /* okay, we're waiting for a key to select a slot; display a message */ if (state == LOADSAVE_SAVE) --- 1469,1475 ---- *************** *** 2037,2041 **** return 0; } #endif - - --- 1959,1961 ---- Only in src\emu: uismall.fh Only in src\emu\video: .svn Only in src\lib: .svn Only in src\lib\expat: .svn Only in src\lib\util: .svn diff -cr src\lib\util\corefile.c e:\mame0118s\src\lib\util\corefile.c *** src\lib\util\corefile.c Mon Sep 03 08:28:21 2007 --- e:\mame0118s\src\lib\util\corefile.c Wed Aug 01 22:00:58 2007 *************** *** 121,126 **** --- 121,127 ---- /* attempt to open the file */ filerr = osd_open(filename, openflags, &(*file)->file, &(*file)->length); (*file)->openflags = openflags; + /* handle errors and return */ if (filerr != FILERR_NONE) { diff -cr src\lib\util\options.c e:\mame0118s\src\lib\util\options.c *** src\lib\util\options.c Mon Sep 03 07:08:40 2007 --- e:\mame0118s\src\lib\util\options.c Sat Aug 04 00:56:20 2007 *************** *** 351,357 **** astring_cpyc(data->defdata, entrylist->defvalue); } data->priority = OPTION_PRIORITY_DEFAULT; - //printf("options_add_entries: '%s' '%s' '%s'\n", data->description, astring_c(data->defdata), astring_c(data->data)); } return TRUE; } --- 351,356 ---- *************** *** 486,492 **** for (optionname = buffer; *optionname != 0; optionname++) if (!isspace(*optionname)) break; ! /* skip comments */ if (*optionname == 0 || *optionname == '#') continue; --- 485,491 ---- for (optionname = buffer; *optionname != 0; optionname++) if (!isspace(*optionname)) break; ! /* skip comments */ if (*optionname == 0 || *optionname == '#') continue; *************** *** 506,512 **** /* NULL-terminate */ *temp++ = 0; optiondata = temp; ! /* scan the data, stopping when we hit a comment */ for (temp = optiondata; *temp != 0; temp++) { --- 505,511 ---- /* NULL-terminate */ *temp++ = 0; optiondata = temp; ! /* scan the data, stopping when we hit a comment */ for (temp = optiondata; *temp != 0; temp++) { *************** *** 516,522 **** break; } *temp = 0; ! //printf("options_parse_ini_file: '%s' = '%s'\n", optionname, optiondata); // %%% /* find our entry */ data = find_entry_data(opts, optionname, FALSE); if (data == NULL) --- 515,521 ---- break; } *temp = 0; ! /* find our entry */ data = find_entry_data(opts, optionname, FALSE); if (data == NULL) *************** *** 670,676 **** data->error_reported = TRUE; } } - //printf("options_get_bool(%s) = %d\n", name, value); // %%%% return value; } --- 669,674 ---- *************** *** 756,763 **** void options_set_string(core_options *opts, const char *name, const char *value, int priority) { ! options_data *data; ! data = find_entry_data(opts, name, FALSE); update_data(opts, data, value, priority); } --- 754,760 ---- void options_set_string(core_options *opts, const char *name, const char *value, int priority) { ! options_data *data = find_entry_data(opts, name, FALSE); update_data(opts, data, value, priority); } Only in src\lib\zlib: .svn Only in src\mame: .svn Only in src\mame\audio: .svn Only in src\mame\drivers: .svn Only in src\mame\etc: .svn Only in src\mame\includes: .svn Only in src\mame\layout: .svn Only in src\mame\layout: abaseb.lh Only in src\mame\layout: atarifb.lh Only in src\mame\layout: atarifb4.lh Only in src\mame\layout: avalnche.lh Only in src\mame\layout: bfm_sc2.lh Only in src\mame\layout: buckrog.lh Only in src\mame\layout: bzone.lh Only in src\mame\layout: cardline.lh Only in src\mame\layout: circus.lh Only in src\mame\layout: clowns.lh Only in src\mame\layout: connect4.lh Only in src\mame\layout: copsnrob.lh Only in src\mame\layout: crash.lh Only in src\mame\layout: darius.lh Only in src\mame\layout: deadeye.lh Only in src\mame\layout: dlair.lh Only in src\mame\layout: firebeat.lh Only in src\mame\layout: funworld.lh Only in src\mame\layout: geebee.lh Only in src\mame\layout: gldncrwn.lh Only in src\mame\layout: goldnpkr.lh Only in src\mame\layout: gypsyjug.lh Only in src\mame\layout: invad2ct.lh Only in src\mame\layout: invaders.lh Only in src\mame\layout: invrvnge.lh Only in src\mame\layout: lazercmd.lh Only in src\mame\layout: maxaflex.lh Only in src\mame\layout: mpu4.lh Only in src\mame\layout: nbmj8688.lh Only in src\mame\layout: paradice.lh Only in src\mame\layout: pmpoker.lh Only in src\mame\layout: pokio.lh Only in src\mame\layout: pottnpkr.lh Only in src\mame\layout: pyramid.lh Only in src\mame\layout: quintoon.lh Only in src\mame\layout: rocknms.lh Only in src\mame\layout: sbrkout.lh Only in src\mame\layout: sidewndr.lh Only in src\mame\layout: slots.lh Only in src\mame\layout: sltblgpo.lh Only in src\mame\layout: sltblgtk.lh Only in src\mame\layout: solarq.lh Only in src\mame\layout: sos.lh Only in src\mame\layout: sspeedr.lh Only in src\mame\layout: starcas.lh Only in src\mame\layout: subroc3d.lh Only in src\mame\layout: tenpindx.lh Only in src\mame\layout: tinv2650.lh Only in src\mame\layout: turbo.lh Only in src\mame\machine: .svn Only in src\mame\video: .svn Only in src: mameq.c Only in e:\mame0118s\src\NecroCore\.svn: empty-file diff -cr src\NecroCore\.svn\entries e:\mame0118s\src\NecroCore\.svn\entries *** src\NecroCore\.svn\entries Thu Sep 13 21:11:08 2007 --- e:\mame0118s\src\NecroCore\.svn\entries Sun Nov 19 17:52:11 2006 *************** *** 1,64 **** ! 8 ! ! dir ! 5 ! svn://localhost/PyMAME/src/NecroCore ! svn://localhost ! ! ! ! 2007-09-03T20:56:16.468750Z ! 5 ! swt ! ! ! svn:special svn:externals svn:needs-lock ! ! PyQuest.h ! file ! ! ! ! ! 2007-09-02T14:55:34.515625Z ! dda7598e0eb0d789967eece1a96bf225 ! 2007-09-03T20:56:16.468750Z ! 5 ! swt ! ! quest.c ! file ! 7 ! ! ! ! 2007-09-14T03:40:10.484375Z ! f2609d14a8e3e7ea066123943a5c341f ! 2007-09-14T04:11:07.812500Z ! 7 ! swt ! ! quest.h ! file ! ! ! ! ! 2007-09-03T06:04:43.625000Z ! 4af5327acc36c86fa996c722a2b7da19 ! 2007-09-03T20:56:16.468750Z ! 5 ! swt ! ! PyQuest.c ! file ! ! ! ! ! 2006-11-12T19:44:14.015625Z ! 070c2e96b0d712f8600fe8d64da39e76 ! 2007-09-03T20:56:16.468750Z ! 5 ! swt ! --- 1,47 ---- ! ! ! ! ! ! ! ! diff -cr src\NecroCore\.svn\format e:\mame0118s\src\NecroCore\.svn\format *** src\NecroCore\.svn\format Mon Sep 03 13:54:48 2007 --- e:\mame0118s\src\NecroCore\.svn\format Mon Nov 06 09:42:46 2006 *************** *** 1 **** ! 8 --- 1 ---- ! 4 Only in e:\mame0118s\src\NecroCore\.svn: README.txt diff -cr src\NecroCore\.svn\text-base\PyQuest.h.svn-base e:\mame0118s\src\NecroCore\.svn\text-base\PyQuest.h.svn-base *** src\NecroCore\.svn\text-base\PyQuest.h.svn-base Sun Sep 02 07:55:34 2007 --- e:\mame0118s\src\NecroCore\.svn\text-base\PyQuest.h.svn-base Sun Nov 12 18:48:22 2006 *************** *** 5,8 **** void ReportPythonError(); QuestDefinition* GetQuestDefinitionFromPy(PyObject* PyQuestDefinition); PyObject* PyGetQuestResult(QuestResult* Result); - PyObject* PyGetQuestResults(QuestResult* Head); --- 5,7 ---- diff -cr src\NecroCore\.svn\text-base\quest.c.svn-base e:\mame0118s\src\NecroCore\.svn\text-base\quest.c.svn-base *** src\NecroCore\.svn\text-base\quest.c.svn-base Thu Sep 13 20:40:10 2007 --- e:\mame0118s\src\NecroCore\.svn\text-base\quest.c.svn-base Sun Nov 12 18:48:12 2006 *************** *** 494,501 **** { static int CallCount = 0; // ! printf("."); // %%%%% ! fflush(stdout); // %%%%% CallCount++; if (GlobalQ->TicksToQuit > -1) { --- 494,500 ---- { static int CallCount = 0; // ! CallCount++; if (GlobalQ->TicksToQuit > -1) { *************** *** 671,676 **** --- 670,676 ---- } printf("Quest: %s\n", Quest->Name); printf("Driver: %s\n", Quest->DriverName); + for (StatIndex = 0; StatIndex < MAX_QUEST_STATS; StatIndex++) { diff -cr src\NecroCore\.svn\text-base\quest.h.svn-base e:\mame0118s\src\NecroCore\.svn\text-base\quest.h.svn-base *** src\NecroCore\.svn\text-base\quest.h.svn-base Sun Sep 02 23:04:43 2007 --- e:\mame0118s\src\NecroCore\.svn\text-base\quest.h.svn-base Sat Nov 18 10:47:50 2006 *************** *** 173,176 **** void QuestErrorOut(); void QuestAbort(); void FreeQuestResult(QuestResult* Result); - void FreeQuestResults(); --- 173,175 ---- Only in e:\mame0118s\src\NecroCore\.svn\tmp: wcprops Only in e:\mame0118s\src\NecroCore\.svn: wcprops diff -cr src\NecroCore\PyQuest.h e:\mame0118s\src\NecroCore\PyQuest.h *** src\NecroCore\PyQuest.h Sun Sep 02 07:55:34 2007 --- e:\mame0118s\src\NecroCore\PyQuest.h Sun Nov 12 13:12:06 2006 *************** *** 5,8 **** void ReportPythonError(); QuestDefinition* GetQuestDefinitionFromPy(PyObject* PyQuestDefinition); PyObject* PyGetQuestResult(QuestResult* Result); - PyObject* PyGetQuestResults(QuestResult* Head); --- 5,7 ---- diff -cr src\NecroCore\quest.c e:\mame0118s\src\NecroCore\quest.c *** src\NecroCore\quest.c Thu Sep 13 20:40:10 2007 --- e:\mame0118s\src\NecroCore\quest.c Sat Nov 18 14:57:24 2006 *************** *** 494,501 **** { static int CallCount = 0; // ! printf("."); // %%%%% ! fflush(stdout); // %%%%% CallCount++; if (GlobalQ->TicksToQuit > -1) { --- 494,500 ---- { static int CallCount = 0; // ! CallCount++; if (GlobalQ->TicksToQuit > -1) { *************** *** 671,676 **** --- 670,676 ---- } printf("Quest: %s\n", Quest->Name); printf("Driver: %s\n", Quest->DriverName); + for (StatIndex = 0; StatIndex < MAX_QUEST_STATS; StatIndex++) { diff -cr src\NecroCore\quest.h e:\mame0118s\src\NecroCore\quest.h *** src\NecroCore\quest.h Sun Sep 02 23:04:43 2007 --- e:\mame0118s\src\NecroCore\quest.h Mon Nov 13 19:11:44 2006 *************** *** 173,176 **** void QuestErrorOut(); void QuestAbort(); void FreeQuestResult(QuestResult* Result); - void FreeQuestResults(); --- 173,175 ---- Only in src\osd: .svn Only in src\osd\osdmini: .svn Only in src\osd\windows: .svn Only in src\osd: winprefix.h Only in src: PyMAME.c Only in src: PyOSD.c Only in src: PyOSD.h Only in src\tools: .svn