[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/arm copyrectangle.cpp,1.1,1.2 copyrectangle.h,1.1,1.2 macros.h,1.1,1.2 widelandscape.cpp,1.1,1.2 widelandscape.h,1.1,1.2 wideportrait.cpp,1.1,1.2 wideportrait.h,1.1,1.2

Chris Apers chrilith at users.sourceforge.net
Wed Oct 6 05:07:35 CEST 2004


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src/arm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1872

Modified Files:
	copyrectangle.cpp copyrectangle.h macros.h widelandscape.cpp 
	widelandscape.h wideportrait.cpp wideportrait.h 
Log Message:
Adjustments

Index: copyrectangle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/arm/copyrectangle.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- copyrectangle.cpp	12 Sep 2004 12:37:38 -0000	1.1
+++ copyrectangle.cpp	6 Oct 2004 09:33:21 -0000	1.2
@@ -4,7 +4,7 @@
 #define MAIN_TYPE	CopyRectangleType
 #include "macros.h"
 
-UInt32 OSystem_CopyRectToScreen(void *userData68KP) {
+void OSystem_CopyRectToScreen(void *userData68KP) {
 // import variables
 	SETPTR	(UInt8 *,	dst				)
 	SETPTR	(UInt8 *,	buf				)
@@ -23,6 +23,4 @@
 			buf += pitch;
 		} while (--h);
 	}
-
-	return 0;
-}
\ No newline at end of file
+}

Index: copyrectangle.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/arm/copyrectangle.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- copyrectangle.h	12 Sep 2004 12:37:38 -0000	1.1
+++ copyrectangle.h	6 Oct 2004 09:33:26 -0000	1.2
@@ -6,6 +6,6 @@
 #define COMPILE_COPYRECT
 #define COMPILE_PACE
 
-UInt32 OSystem_CopyRectToScreen(void *userData68KP);
+void OSystem_CopyRectToScreen(void *userData68KP);
 
-#endif
\ No newline at end of file
+#endif

Index: macros.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/arm/macros.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- macros.h	12 Sep 2004 12:36:40 -0000	1.1
+++ macros.h	6 Oct 2004 09:33:26 -0000	1.2
@@ -13,7 +13,7 @@
 	#define ARM_ADDP(member)		data.member = &member;
 	#define ARM_ADDM(member)		data.member = member;
 	#define ARM_ADDV(member, var)	data.member = var;
-	#define ARM_INIT(id)			data.funcID = id;
+//	#define ARM_INIT(id)			data.funcID = id;
 
 	#define ARM_DATA()		&data
 	#define ARM_CONTINUE()	} else
@@ -36,7 +36,7 @@
 	#define ARM_ADDP(member)
 	#define ARM_ADDM(member)
 	#define ARM_ADDV(member, var)
-	#define ARM_INIT(id)
+//	#define ARM_INIT(id)
 
 	#define ARM_DATA()
 	#define ARM_CONTINUE()
@@ -72,4 +72,4 @@
 	#	define SET8(type, member)			_SET8  (MAIN_TYPE, member, type, member)
 	#endif
 
-#endif
\ No newline at end of file
+#endif

Index: widelandscape.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/arm/widelandscape.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- widelandscape.cpp	12 Sep 2004 12:38:48 -0000	1.1
+++ widelandscape.cpp	6 Oct 2004 09:33:26 -0000	1.2
@@ -5,7 +5,7 @@
 #define MAIN_TYPE	WideType
 #include "macros.h"
 
-UInt32 OSystem_updateScreen_wideLandscape(void *userData68KP) {
+void OSystem_updateScreen_wideLandscape(void *userData68KP) {
 // import variables
 	SETPTR(UInt8 *	,dst)
 	SETPTR(UInt8 *	,src)
@@ -24,6 +24,5 @@
 		MemMove(dst, dst - 480, 480);
 		dst += 480;
 	}
-	
-	return 0;
 }
+

Index: widelandscape.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/arm/widelandscape.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- widelandscape.h	12 Sep 2004 12:38:48 -0000	1.1
+++ widelandscape.h	6 Oct 2004 09:33:26 -0000	1.2
@@ -6,6 +6,6 @@
 #define COMPILE_WIDELANDSCAPE
 #define COMPILE_PACE
 
-UInt32 OSystem_updateScreen_wideLandscape(void *userData68KP);
+void OSystem_updateScreen_wideLandscape(void *userData68KP);
 
-#endif
\ No newline at end of file
+#endif

Index: wideportrait.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/arm/wideportrait.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wideportrait.cpp	12 Sep 2004 12:40:51 -0000	1.1
+++ wideportrait.cpp	6 Oct 2004 09:33:26 -0000	1.2
@@ -5,7 +5,7 @@
 #define MAIN_TYPE	WideType
 #include "macros.h"
 
-UInt32 OSystem_updateScreen_widePortrait(void *userData68KP) {
+void OSystem_updateScreen_widePortrait(void *userData68KP) {
 // import variables
 	SETPTR(UInt8 *	,dst)
 	SETPTR(UInt8 *	,src)
@@ -38,6 +38,4 @@
 		MemMove(dst, dst - WIDE_PITCH, 300);	// 300 = 200 x 1.5
 		dst += WIDE_PITCH;
 	}
-	
-	return 0;
-}
\ No newline at end of file
+}

Index: wideportrait.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/arm/wideportrait.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wideportrait.h	12 Sep 2004 12:40:51 -0000	1.1
+++ wideportrait.h	6 Oct 2004 09:33:26 -0000	1.2
@@ -6,6 +6,6 @@
 #define COMPILE_WIDEPORTRAIT
 #define COMPILE_PACE
 
-UInt32 OSystem_updateScreen_widePortrait(void *userData68KP);
+void OSystem_updateScreen_widePortrait(void *userData68KP);
 
-#endif
\ No newline at end of file
+#endif





More information about the Scummvm-git-logs mailing list