[Scummvm-cvs-logs] CVS: scummvm/queen display.cpp,1.72,1.73 resource.cpp,1.51,1.52

Chris Apers chrilith at users.sourceforge.net
Tue Nov 9 02:27:08 CET 2004


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

Modified Files:
	display.cpp resource.cpp 
Log Message:
Cleanup

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- display.cpp	8 Oct 2004 18:43:23 -0000	1.72
+++ display.cpp	9 Nov 2004 10:26:32 -0000	1.73
@@ -28,6 +28,7 @@
 #include "queen/resource.h"
 
 #if defined(__PALM_OS__)
+#include "init_arm.h"
 #include "arm/native.h"
 #include "arm/macros.h"
 #endif
@@ -52,18 +53,12 @@
 
 	initFont();
 
-#ifndef __PALM_OS__
 	_screenBuf   = new uint8[SCREEN_W * SCREEN_H];
 	_panelBuf    = new uint8[PANEL_W * PANEL_H];
 	_backdropBuf = new uint8[BACKDROP_W * BACKDROP_H];
 	memset(_screenBuf,   0, SCREEN_W * SCREEN_H);
 	memset(_panelBuf,    0, PANEL_W * PANEL_H);
 	memset(_backdropBuf, 0, BACKDROP_W * BACKDROP_H);
-#else
-	_screenBuf   = (uint8 *)calloc(SCREEN_W * SCREEN_H, sizeof(uint8));
-	_panelBuf    = (uint8 *)calloc(PANEL_W * PANEL_H, sizeof(uint8));
-	_backdropBuf = (uint8 *)calloc(BACKDROP_W * BACKDROP_H, sizeof(uint8));
-#endif
 
 	_fullRefresh = 1;
 	_dirtyBlocksWidth  = SCREEN_W / D_BLOCK_W;
@@ -85,15 +80,9 @@
 }
 
 Display::~Display() {
-#ifndef __PALM_OS__
 	delete[] _backdropBuf;
 	delete[] _panelBuf;
 	delete[] _screenBuf;
-#else
-	free(_backdropBuf);
-	free(_panelBuf);
-	free(_screenBuf);
-#endif
 
 	delete[] _pal.room;
 	delete[] _pal.screen;

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- resource.cpp	6 Oct 2004 09:58:18 -0000	1.51
+++ resource.cpp	9 Nov 2004 10:26:32 -0000	1.52
@@ -105,15 +105,13 @@
 		*size = sz;
 	}
 	byte *dstBuf;
-#ifndef __PALM_OS__
+
 	if (useMalloc) {
 		dstBuf = (byte *)malloc(sz);
 	} else {
 		dstBuf = new byte[sz];
 	}
-#else
-	dstBuf = (byte *)calloc(sz, sizeof(byte));
-#endif
+
 	_resourceFile->seek(re->offset + skipBytes);
 	_resourceFile->read(dstBuf, sz);
 	return dstBuf;





More information about the Scummvm-git-logs mailing list