Compilation fixes. Overlay functions are stubs only at the moment.

svn-id: r5009

4 files changed, 34 insertions, 6 deletions

diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp
index 77b4b8c4aa..d8f65e9e5c 100644
--- a/backends/morphos/morphos.cpp
+++ b/backends/morphos/morphos.cpp
@@ -1343,3 +1343,24 @@ void OSystem_MorphOS::init_size(uint w, uint h)
 	CreateScreen(CSDSPTYPE_KEEP);
 }
 
+void OSystem_MorphOS::show_overlay()
+{
+}
+
+void OSystem_MorphOS::hide_overlay()
+{
+}
+
+void OSystem_MorphOS::clear_overlay()
+{
+}
+
+void OSystem_MorphOS::grab_overlay(int16 *buf, int pitch)
+{
+}
+
+void OSystem_MorphOS::copy_rect_overlay(const int16 *ovl, int pitch, int x, int y, int w, int h)
+{
+}
+
+
diff --git a/backends/morphos/morphos.h b/backends/morphos/morphos.h
index 6b2078f026..639336273d 100644
--- a/backends/morphos/morphos.h
+++ b/backends/morphos/morphos.h
@@ -65,6 +65,13 @@ class OSystem_MorphOS : public OSystem
 		// Shaking is used in SCUMM. Set current shake position.
 		virtual void set_shake_pos(int shake_pos);
 
+		// Overlay
+		virtual void show_overlay();
+		virtual void hide_overlay();
+		virtual void clear_overlay();
+		virtual void grab_overlay(int16 *buf, int pitch);
+		virtual void copy_rect_overlay(const int16 *buf, int pitch, int x, int y, int w, int h);
+
 		// Get the number of milliseconds since the program was started.
 		virtual uint32 get_msecs();
 
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;
diff --git a/backends/morphos/morphos_timer.h b/backends/morphos/morphos_timer.h
index 05f710719a..589ab113a1 100644
--- a/backends/morphos/morphos_timer.h
+++ b/backends/morphos/morphos_timer.h
@@ -57,7 +57,7 @@ struct TimerServiceMessage
 class Timer
 {
 	public:
-	   Timer(Scumm * system);
+		Timer(Engine * engine);
 	   ~Timer();
 
 		bool init();
@@ -67,7 +67,7 @@ class Timer
 
 	protected:
 		bool SendMsg(ULONG MsgID, TimerProc procedure, LONG interval);
-		static void TimerService(Timer *, Scumm *);
+		static void TimerService(Timer *, Engine *);
 
 		Process *TimerServiceThread;
 		SignalSemaphore TimerServiceSemaphore;