[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.195,1.196 gfx.cpp,2.478,2.479

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5462

Modified Files:
	costume.cpp gfx.cpp 
Log Message:
Not needed anymore :)

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- costume.cpp	20 Nov 2005 00:46:15 -0000	1.195
+++ costume.cpp	3 Dec 2005 18:56:28 -0000	1.196
@@ -27,11 +27,6 @@
 #include "scumm/sound.h"
 #include "scumm/util.h"
 
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
 namespace Scumm {
 
 #ifdef PALMOS_68K
@@ -414,27 +409,6 @@
 #undef MASK_AT
 
 void ClassicCostumeRenderer::proc3(Codec1 &v1) {
-#ifdef PALMOS_68K
-	ARM_START(CostumeProc3Type)
-		ARM_INIT(SCUMM_PROC3)
-		ARM_ADDP(v1)
-		ARM_ADDM(_srcptr)
-		ARM_ADDM(_height)
-		ARM_ADDM(_scaleIndexX)
-		ARM_ADDM(_scaleIndexY)
-		ARM_ADDM(_scaleX)
-		ARM_ADDM(_scaleY)
-		ARM_ADDM(_numStrips)
-		ARM_ADDM(_shadow_mode)
-		ARM_ADDM(_shadow_table)
-		ARM_ADDM(_palette)
-		ARM_ADDV(_out_pitch,	_out.pitch)
-		ARM_ADDV(_out_w,		_out.w)
-		ARM_ADDV(_out_h,		_out.h)
-		ARM_CALL_VALUE(ARM_ENGINE, PNO_DATA(), _scaleIndexX)
-	ARM_END()
-#endif
-
 	const byte *mask, *src;
 	byte *dst;
 	byte len, maskbit;

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.478
retrieving revision 2.479
diff -u -d -r2.478 -r2.479
--- gfx.cpp	19 Nov 2005 23:53:02 -0000	2.478
+++ gfx.cpp	3 Dec 2005 18:56:28 -0000	2.479
@@ -29,11 +29,6 @@
 #include "scumm/usage_bits.h"
 #include "scumm/wiz_he.h"
 
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
 namespace Scumm {
 
 static void blit(byte *dst, int dstPitch, const byte *src, int srcPitch, int w, int h);
@@ -542,20 +537,6 @@
 	byte *dst = _compositeBuf + x + y * _screenWidth;
 	const byte *text = (byte *)_charset->_textSurface.pixels + x + y * _charset->_textSurface.pitch;
 
-#ifdef PALMOS_68K
-	ARM_START(DrawStripType)
-		ARM_INIT(SCUMM_DRAWSTRIP)
-		ARM_ADDM(width)
-		ARM_ADDM(height)
-		ARM_ADDM(src)
-		ARM_ADDM(dst)
-		ARM_ADDM(text)
-		ARM_ADDV(_vm_screenWidth, _screenWidth)
-		ARM_ADDV(vs_pitch, vs->pitch)
-		ARM_ADDV(_charset_textSurface_pitch, _charset->_textSurface.pitch)
-		ARM_CALL(ARM_ENGINE, PNO_DATA())
-	ARM_CONTINUE()
-#endif
 	// Compose the text over the game graphics
 	for (int h = 0; h < height; ++h) {
 		for (int w = 0; w < width; ++w) {
@@ -606,20 +587,6 @@
 // Odd lines have colors swapped, so there will be checkered patterns.
 // But apparently there is a mistake for 10th color.
 void ScummEngine::ditherCGA(byte *dst, int dstPitch, int x, int y, int width, int height) const {
-#ifdef PALMOS_68K
-	ARM_START(RenderCGAType)
-		ARM_INIT(SCUMM_RENDERCGA)
-		ARM_ADDM(dst)
-		ARM_ADDM(dstPitch)
-		ARM_ADDM(x)
-		ARM_ADDM(y)
-		ARM_ADDM(width)
-		ARM_ADDM(height)
-		ARM_ADDV(_version, _version)
-		ARM_CALL(ARM_ENGINE, PNO_DATA())
-	ARM_END()
-#endif
-
 	byte *ptr;
 	int idx1, idx2;
 	static const byte cgaDither[2][2][16] = {
@@ -654,20 +621,6 @@
 //         cccc1
 //         dddd0
 void ScummEngine::ditherHerc(byte *src, byte *hercbuf, int srcPitch, int *x, int *y, int *width, int *height) const {
-#ifdef PALMOS_68K
-	ARM_START(RenderHercType)
-		ARM_INIT(SCUMM_RENDERHERC)
-		ARM_ADDM(src)
-		ARM_ADDM(hercbuf)
-		ARM_ADDM(srcPitch)
-		ARM_ADDM(x)
-		ARM_ADDM(y)
-		ARM_ADDM(width)
-		ARM_ADDM(height)
-		ARM_CALL(ARM_ENGINE, PNO_DATA())
-	ARM_END()
-#endif
-
 	byte *srcptr, *dstptr;
 	int xo = *x, yo = *y, widtho = *width, heighto = *height;
 	int idx1, idx2, dsty = 0, y1;
@@ -3289,4 +3242,3 @@
 _GEND
 
 #endif
-