[Scummvm-cvs-logs] CVS: scummvm/morphos morphos.cpp,1.15,1.16 morphos.h,1.7,1.8

Lionel Ulmer bbrox at users.sourceforge.net
Sat May 4 02:56:01 CEST 2002


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

Modified Files:
	morphos.cpp morphos.h 
Log Message:
Change the 'poperty' call to be 64-bits clean.

Porters, please check that I did not break anything while updating
your ports. Thanks :-)



Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/morphos/morphos.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- morphos.cpp	29 Apr 2002 13:12:45 -0000	1.15
+++ morphos.cpp	4 May 2002 09:55:10 -0000	1.16
@@ -232,7 +232,7 @@
 	return ScummMusicThread;
 }
 
-uint32 OSystem_MorphOS::property(int param, uint32 value)
+uint32 OSystem_MorphOS::property(int param, Property *value)
 {
 	switch( param )
 	{
@@ -241,7 +241,7 @@
 			return 1;
 
 		case PROP_SET_WINDOW_CAPTION:
-			sprintf( ScummWndTitle, "ScummVM MorphOS - %s", (char *)value );
+			sprintf( ScummWndTitle, "ScummVM MorphOS - %s", value->caption );
 			if( ScummWindow )
 				SetWindowTitles( ScummWindow, ScummWndTitle, ScummWndTitle );
 			return 1;
@@ -276,11 +276,11 @@
 			break;
 
 		case PROP_SHOW_DEFAULT_CURSOR:
-			if( value )
+			if( value->show_cursor )
 				ClearPointer( ScummWindow );
 			else
 				SetPointer( ScummWindow, ScummNoCursor, 1, 1, 0, 0 );
-			ScummOrigMouse = ScummDefaultMouse = value;
+			ScummOrigMouse = ScummDefaultMouse = value->show_cursor;
 			break;
 
 		case PROP_GET_SAMPLE_RATE:

Index: morphos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/morphos/morphos.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- morphos.h	29 Apr 2002 13:12:45 -0000	1.7
+++ morphos.h	4 May 2002 09:55:10 -0000	1.8
@@ -75,7 +75,7 @@
 		virtual bool set_sound_proc(void *param, SoundProc *proc, byte format);
 				  void fill_sound    (byte * stream, int len);
 
-		virtual uint32 property(int param, uint32 value);
+		virtual uint32 property(int param, Property *value);
 
 		// Poll cdrom status
 		// Returns true if cd audio is playing





More information about the Scummvm-git-logs mailing list