aboutsummaryrefslogtreecommitdiff
path: root/backends/morphos/morphos_timer.cpp
diff options
context:
space:
mode:
authorRuediger Hanke2002-09-23 16:31:05 +0000
committerRuediger Hanke2002-09-23 16:31:05 +0000
commit971f47644ef82b06b705745cf21668360516f835 (patch)
treef34d61fe4555dacf85bc6c0e6c100c693e7969e4 /backends/morphos/morphos_timer.cpp
parent412075437b712cdf91dae5c569026bd8c742a491 (diff)
downloadscummvm-rg350-971f47644ef82b06b705745cf21668360516f835.tar.gz
scummvm-rg350-971f47644ef82b06b705745cf21668360516f835.tar.bz2
scummvm-rg350-971f47644ef82b06b705745cf21668360516f835.zip
Compilation fixes. Overlay functions are stubs only at the moment.
svn-id: r5009
Diffstat (limited to 'backends/morphos/morphos_timer.cpp')
-rw-r--r--backends/morphos/morphos_timer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/morphos/morphos_timer.cpp b/backends/morphos/morphos_timer.cpp
index d838a44e36..451aff654c 100644
--- a/backends/morphos/morphos_timer.cpp
+++ b/backends/morphos/morphos_timer.cpp
@@ -39,7 +39,7 @@ static TagItem TimerServiceTags[] = { { NP_Entry, 0 },
{ TAG_DONE, 0 }
};
-Timer::Timer(Scumm * system)
+Timer::Timer(Engine * engine)
{
static EmulFunc ThreadEmulFunc;
@@ -50,7 +50,7 @@ Timer::Timer(Scumm * system)
ThreadEmulFunc.StackSize = 16000;
ThreadEmulFunc.Extension = 0;
ThreadEmulFunc.Arg1 = (ULONG) this;
- ThreadEmulFunc.Arg2 = (ULONG) system;
+ ThreadEmulFunc.Arg2 = (ULONG) engine;
TimerServiceTags[0].ti_Data = (ULONG) &ThreadEmulFunc;
TimerServiceThread = CreateNewProc(TimerServiceTags);
}
@@ -116,7 +116,7 @@ bool Timer::SendMsg(ULONG msg_id, TimerProc procedure, LONG interval)
return true;
}
-void Timer::TimerService(Timer *this_ptr, Scumm *system)
+void Timer::TimerService(Timer *this_ptr, Engine *engine)
{
MsgPort *port = &((Process *) FindTask(NULL))->pr_MsgPort;
ULONG port_bit = 1 << port->mp_SigBit;
@@ -216,7 +216,7 @@ void Timer::TimerService(Timer *this_ptr, Scumm *system)
timerequest *req = timer_slots[t].ts_IORequest;
WaitIO((IORequest *) req);
interval = timer_slots[t].ts_Interval;
- (*timer_slots[t].ts_Callback)(system);
+ (*timer_slots[t].ts_Callback)(engine);
GetSysTime(&end_callback);
SubTime(&end_callback, &start_callback);
interval -= end_callback.tv_sec*1000+end_callback.tv_micro/1000+40;