[Scummvm-cvs-logs] CVS: scummvm/backends/morphos morphos.cpp,1.6,1.7 morphos.h,1.5,1.6 morphos_timer.cpp,1.3,1.4 morphos_timer.h,1.2,1.3

[Ruediger Hanke]

Update of /cvsroot/scummvm/scummvm/backends/morphos
In directory usw-pr-cvs1:/tmp/cvs-serv3250

Modified Files:
	morphos.cpp morphos.h morphos_timer.cpp morphos_timer.h 
Log Message:
Compilation fixes. Overlay functions are stubs only at the moment.

Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- morphos.cpp	15 Sep 2002 09:16:28 -0000	1.6
+++ morphos.cpp	23 Sep 2002 16:31:05 -0000	1.7
@@ -1343,3 +1343,24 @@
 	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)
+{
+}
+
+

Index: morphos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- morphos.h	15 Sep 2002 09:16:28 -0000	1.5
+++ morphos.h	23 Sep 2002 16:31:05 -0000	1.6
@@ -65,6 +65,13 @@
 		// 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();
 

Index: morphos_timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos_timer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- morphos_timer.cpp	15 Sep 2002 09:16:28 -0000	1.3
+++ morphos_timer.cpp	23 Sep 2002 16:31:05 -0000	1.4
@@ -39,7 +39,7 @@
 									  { TAG_DONE,    0 }
 									};
 
-Timer::Timer(Scumm * system)
+Timer::Timer(Engine * engine)
 {
 	static EmulFunc ThreadEmulFunc;
 
@@ -50,7 +50,7 @@
 	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 @@
 	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 @@
 					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;

Index: morphos_timer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos_timer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- morphos_timer.h	22 Aug 2002 10:43:50 -0000	1.2
+++ morphos_timer.h	23 Sep 2002 16:31:05 -0000	1.3
@@ -57,7 +57,7 @@
 class Timer
 {
 	public:
-	   Timer(Scumm * system);
+		Timer(Engine * engine);
 	   ~Timer();
 
 		bool init();
@@ -67,7 +67,7 @@
 
 	protected:
 		bool SendMsg(ULONG MsgID, TimerProc procedure, LONG interval);
-		static void TimerService(Timer *, Scumm *);
+		static void TimerService(Timer *, Engine *);
 
 		Process *TimerServiceThread;
 		SignalSemaphore TimerServiceSemaphore;