From 311e9165ed3b9442049e9e5e6b25c31d024f04ac Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 7 May 2008 15:09:10 +0000
Subject: Proper delete[] formatting (this time all occurences should've been
 changed...)

svn-id: r31929
---
 engines/scumm/smush/channel.cpp       | 6 +++---
 engines/scumm/smush/codec37.cpp       | 2 +-
 engines/scumm/smush/imuse_channel.cpp | 6 +++---
 engines/scumm/smush/saud_channel.cpp  | 2 +-
 engines/scumm/smush/smush_player.cpp  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engines/scumm/smush')

diff --git a/engines/scumm/smush/channel.cpp b/engines/scumm/smush/channel.cpp
index 836defd6fc..ccf67764e3 100644
--- a/engines/scumm/smush/channel.cpp
+++ b/engines/scumm/smush/channel.cpp
@@ -70,7 +70,7 @@ void SmushChannel::processBuffer() {
 				_tbufferSize = 0;
 			}
 			if (_sbufferSize == 0) {
-				delete[]_sbuffer;
+				delete[] _sbuffer;
 				_sbuffer = 0;
 			}
 		} else {
@@ -90,7 +90,7 @@ void SmushChannel::processBuffer() {
 			if (!_sbuffer)
 				error("smush channel failed to allocate memory");
 			memcpy(_sbuffer, _tbuffer + offset, _sbufferSize);
-			delete[]_tbuffer;
+			delete[] _tbuffer;
 			_tbuffer = 0;
 			_tbufferSize = 0;
 		} else {
@@ -102,7 +102,7 @@ void SmushChannel::processBuffer() {
 					error("smush channel failed to allocate memory");
 				memcpy(_tbuffer, old + offset, new_size);
 				_tbufferSize = new_size;
-				delete[]old;
+				delete[] old;
 			}
 		}
 	}
diff --git a/engines/scumm/smush/codec37.cpp b/engines/scumm/smush/codec37.cpp
index deabd25595..658d67c1b4 100644
--- a/engines/scumm/smush/codec37.cpp
+++ b/engines/scumm/smush/codec37.cpp
@@ -52,7 +52,7 @@ Codec37Decoder::Codec37Decoder(int width, int height) {
 
 Codec37Decoder::~Codec37Decoder() {
 	if (_offsetTable) {
-		delete[]_offsetTable;
+		delete[] _offsetTable;
 		_offsetTable = 0;
 		_tableLastPitch = -1;
 		_tableLastIndex = -1;
diff --git a/engines/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp
index b4d261f4d1..822f32a896 100644
--- a/engines/scumm/smush/imuse_channel.cpp
+++ b/engines/scumm/smush/imuse_channel.cpp
@@ -83,7 +83,7 @@ bool ImuseChannel::appendData(Chunk &b, int32 size) {
 			if (!_tbuffer)
 				error("imuse_channel failed to allocate memory");
 			memcpy(_tbuffer, old, _tbufferSize);
-			delete[]old;
+			delete[] old;
 			b.read(_tbuffer + _tbufferSize, size);
 			_tbufferSize += size;
 		} else {
@@ -155,7 +155,7 @@ void ImuseChannel::decode() {
 			_tbuffer = new byte[new_size];
 			if (!_tbuffer)  error("imuse_channel failed to allocate memory");
 			memcpy(_tbuffer, old, _tbufferSize);
-			delete[]old;
+			delete[] old;
 			memcpy(_tbuffer + _tbufferSize, _sbuffer + _sbufferSize - remaining_size, remaining_size);
 			_tbufferSize += remaining_size;
 		}
@@ -180,7 +180,7 @@ void ImuseChannel::decode() {
 		value = ((((v2 & 0xf0) << 4) | v3) << 4) - 0x8000;
 		WRITE_BE_UINT16(decoded, value); decoded += 2;
 	}
-	delete[]_sbuffer;
+	delete[] _sbuffer;
 	_sbuffer = (byte *)keep;
 	_sbufferSize = new_size;
 }
diff --git a/engines/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp
index 97f86fe5d9..2fe34efe29 100644
--- a/engines/scumm/smush/saud_channel.cpp
+++ b/engines/scumm/smush/saud_channel.cpp
@@ -135,7 +135,7 @@ bool SaudChannel::appendData(Chunk &b, int32 size) {
 		if (!_tbuffer)
 			error("saud_channel failed to allocate memory");
 		memcpy(_tbuffer, old, _tbufferSize);
-		delete[]old;
+		delete[] old;
 		b.read(_tbuffer + _tbufferSize, size);
 		_tbufferSize += size;
 	} else {
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index ec48a09196..494357a90c 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -86,7 +86,7 @@ public:
 	}
 	~StringResource() {
 		for (int32 i = 0; i < _nbStrings; i++) {
-			delete[]_strings[i].string;
+			delete[] _strings[i].string;
 		}
 	}
 
@@ -206,7 +206,7 @@ static StringResource *getStrings(ScummEngine *vm, const char *file, bool is_enc
 	StringResource *sr = new StringResource;
 	assert(sr);
 	sr->init(filebuffer, length);
-	delete[]filebuffer;
+	delete[] filebuffer;
 	return sr;
 }
 
-- 
cgit v1.2.3