summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/mame.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2007-12-17 16:37:57 +0000
committer Aaron Giles <aaron@aarongiles.com>2007-12-17 16:37:57 +0000
commitc82a966b3b72d79ac3ce394980d6b5806e752160 (patch)
treef46dd63acdd83498db10a0563bb4e874df26d903 /src/emu/mame.c
parent8a8ccc594989d85f2277c48d3c158f7cee41d06b (diff)
Changes for MAME 0.121u2.mame0121u2
Diffstat (limited to 'src/emu/mame.c')
-rw-r--r--src/emu/mame.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/mame.c b/src/emu/mame.c
index bc50082303a..2d23eaad4e5 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -378,7 +378,7 @@ int mame_execute(core_options *options)
begin_resource_tracking();
/* perform a soft reset -- this takes us to the running phase */
- soft_reset(machine, 0);
+ soft_reset(machine, NULL, 0);
/* run the CPUs until a reset or exit */
mame->hard_reset_pending = FALSE;
@@ -392,7 +392,7 @@ int mame_execute(core_options *options)
/* otherwise, just pump video updates through */
else
- video_frame_update();
+ video_frame_update(FALSE);
/* handle save/load */
if (mame->saveload_schedule_callback)
@@ -1508,7 +1508,7 @@ static void init_machine(running_machine *machine)
/* initialize the timers and allocate a soft_reset timer */
/* this must be done before cpu_init so that CPU's can allocate timers */
timer_init(machine);
- mame->soft_reset_timer = timer_alloc(soft_reset);
+ mame->soft_reset_timer = timer_alloc(soft_reset, NULL);
/* init the osd layer */
osd_init(machine);