[Scummvm-cvs-logs] CVS: scummvm/queen graphics.cpp,1.34,1.35 logic.cpp,1.58,1.59 resource.cpp,1.18,1.19 sound.cpp,1.3,1.4 talk.cpp,1.23,1.24

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv13300/queen

Modified Files:
	graphics.cpp logic.cpp resource.cpp sound.cpp talk.cpp 
Log Message:
whatever

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- graphics.cpp	23 Oct 2003 06:44:35 -0000	1.34
+++ graphics.cpp	25 Oct 2003 01:11:14 -0000	1.35
@@ -126,7 +126,7 @@
 void Graphics::bankErase(uint32 bankslot) {
 
 	debug(9, "Graphics::bankErase(%d)", bankslot);
-	delete[] _banks[bankslot].data;
+	free(_banks[bankslot].data);
 	_banks[bankslot].data = 0;	
 }
 
@@ -135,9 +135,9 @@
 
 	bankLoad("control.BBK",17);
 	bankUnpack(1, 1, 17); // Mouse pointer
-    bankUnpack(3, 3, 17); // Up arrow dialogue
-    bankUnpack(4, 4, 17); // Down arrow dialogue
-    bankErase(17);
+	bankUnpack(3, 3, 17); // Up arrow dialogue
+	bankUnpack(4, 4, 17); // Down arrow dialogue
+	bankErase(17);
 }
 
 
@@ -722,7 +722,7 @@
 	}
 	uint32 size = _resource->fileSize(name);
 	_display->pcxReadBackdrop(pcxbuf, size, room > 114);
-	delete[] pcxbuf;
+	free(pcxbuf);
 
 	if (room >= 90) {
 		_cameraBob = 0;
@@ -738,7 +738,7 @@
 	}
 	uint32 size = _resource->fileSize("panel.pcx");
 	_display->pcxReadPanel(pcxbuf, size);
-	delete[] pcxbuf;
+	free(pcxbuf);
 }
 
 
@@ -752,7 +752,7 @@
 
 	// load and unpack journal frames
 	frameEraseAll(false);
-    bankLoad("journal.BBK", 8);
+	bankLoad("journal.BBK", 8);
 	for(i = 1; i <= 20; ++i) {
 		bankUnpack(i, FRAMES_JOURNAL + i, 8);
 		// set hot spots to zero
@@ -761,7 +761,7 @@
 	}
 	// adjust info box hot spot to put it on top always
 	_frames[FRAMES_JOURNAL + 20].yhotspot = 200;
-    bankErase(8);
+	bankErase(8);
 
 	// TODO: setup zones
 

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- logic.cpp	24 Oct 2003 08:55:13 -0000	1.58
+++ logic.cpp	25 Oct 2003 01:11:14 -0000	1.59
@@ -156,7 +156,7 @@
 }
 
 Logic::~Logic() {
-	delete[] _jas;
+	free(_jas);
 	delete _walk;
 }
 

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- resource.cpp	21 Oct 2003 12:38:01 -0000	1.18
+++ resource.cpp	25 Oct 2003 01:11:14 -0000	1.19
@@ -79,7 +79,7 @@
 	_resourceFile->close();
 	if(_resourceTable != _resourceTablePEM10) 
 		delete[] _resourceTable;
-	delete[] _JAS2Ptr;
+	free(_JAS2Ptr);
 }
 
 int32 Resource::resourceIndex(const char *filename) {
@@ -144,7 +144,7 @@
 uint8 *Resource::loadFile(const char *filename, uint32 skipBytes, byte *dstBuf) {
 	uint32 size = fileSize(filename);
 	if (dstBuf == NULL) {
-		dstBuf = new byte[size];
+		dstBuf = (byte *)malloc(size);
 	}
 	// skip 'skipBytes' bytes (useful for headers)
 	_resourceFile->seek(fileOffset(filename) + skipBytes, SEEK_SET);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sound.cpp	24 Oct 2003 23:09:00 -0000	1.3
+++ sound.cpp	25 Oct 2003 01:11:14 -0000	1.4
@@ -62,7 +62,7 @@
 }
 
 int SBSound::playSound(byte *sound, uint32 size) {
-	byte flags = 0 | SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTODELETE;
+	byte flags = 0 | SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE;
 	return _mixer->playRaw(&_sfxHandle, sound, size, 11025, flags);
 }
 

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- talk.cpp	23 Oct 2003 18:50:47 -0000	1.23
+++ talk.cpp	25 Oct 2003 01:11:14 -0000	1.24
@@ -78,7 +78,7 @@
 }
 
 Talk::~Talk() {
-	delete[] _fileData;
+	free(_fileData);
 }