From 3d9ea59616cd6f559b8a6e25f56734972fb7badf Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 7 May 2008 14:20:37 +0000
Subject: Changed kyra to use delete[] instead of delete [].

svn-id: r31925
---
 engines/kyra/sound_towns.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'engines/kyra/sound_towns.cpp')

diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 9ac865c157..d2ce48f452 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -599,18 +599,18 @@ SoundTowns_EuphonyDriver::~SoundTowns_EuphonyDriver() {
 	MidiDriver_YM2612::removeLookupTables();
 
 	if (_fmInstruments) {
-		delete [] _fmInstruments;
+		delete[] _fmInstruments;
 		_fmInstruments = 0;
 	}
 
 	if (_waveInstruments) {
-		delete [] _waveInstruments;
+		delete[] _waveInstruments;
 		_waveInstruments = 0;
 	}
 
 	for (int i = 0; i < 10; i++) {
 		if (_waveSounds[i]) {
-			delete [] _waveSounds[i];
+			delete[] _waveSounds[i];
 			_waveSounds[i] = 0;
 		}
 	}
@@ -709,14 +709,14 @@ void SoundTowns_EuphonyDriver::send(byte chan, uint32 b) {
 
 void SoundTowns_EuphonyDriver::loadFmInstruments(const byte *instr) {
 	if (_fmInstruments)
-		delete [] _fmInstruments;
+		delete[] _fmInstruments;
 	_fmInstruments = new uint8[0x1800];
 	memcpy(_fmInstruments, instr, 0x1800);
 }
 
 void SoundTowns_EuphonyDriver::loadWaveInstruments(const byte *instr) {
 	if (_waveInstruments)
-		delete [] _waveInstruments;
+		delete[] _waveInstruments;
 	_waveInstruments = new uint8[0x1000];
 	memcpy(_waveInstruments, instr, 0x1000);
 
@@ -724,7 +724,7 @@ void SoundTowns_EuphonyDriver::loadWaveInstruments(const byte *instr) {
 
 	for (uint8 i = 0; i < 10; i++) {
 		if (_waveSounds[i])
-			delete [] _waveSounds[i];
+			delete[] _waveSounds[i];
 		uint32 numsamples = READ_LE_UINT32(pos + 0x0C);
 		_waveSounds[i] = new int8[numsamples + 0x20];
         memcpy(_waveSounds[i], pos, 0x20);
@@ -1010,7 +1010,7 @@ SoundTowns_EuphonyTrackQueue * SoundTowns_EuphonyTrackQueue::reset() {
 
 void SoundTowns_EuphonyTrackQueue::loadDataToCurrentPosition(uint8 * trackdata, uint32 size, bool loop) {
 	if (_trackData)
-		delete [] _trackData;
+		delete[] _trackData;
 	_trackData = new uint8[0xC58A];
 	memset(_trackData, 0, 0xC58A);
 	Screen::decodeFrame4(trackdata, _trackData, size);
@@ -1051,13 +1051,13 @@ void SoundTowns_EuphonyTrackQueue::release() {
 	_used = _fchan = _wchan = 0;
 
 	if (_trackData) {
-		delete [] _trackData;
+		delete[] _trackData;
 		_trackData = 0;
 	}
 
 	while (i) {
 		if (i->_trackData) {
-			delete [] i->_trackData;
+			delete[] i->_trackData;
 			i->_trackData = 0;
 		}
 		i = i->_next;
@@ -1097,7 +1097,7 @@ SoundTowns::SoundTowns(KyraEngine *vm, Audio::Mixer *mixer)
 SoundTowns::~SoundTowns() {
 	AudioCD.stop();
 	haltTrack();
-	delete [] _sfxFileData;
+	delete[] _sfxFileData;
 
 	Common::StackLock lock(_mutex);
 	_driver->setTimerCallback(0, 0);
@@ -1164,7 +1164,7 @@ void SoundTowns::loadSoundFile(uint file) {
 	if (_sfxFileIndex == file)
 		return;
 	_sfxFileIndex = file;
-	delete [] _sfxFileData;
+	delete[] _sfxFileData;
 	_sfxFileData = _vm->resource()->fileData(fileListEntry(file), 0);
 }
 
@@ -1293,7 +1293,7 @@ bool SoundTowns::loadInstruments() {
 
 	_driver->queue()->loadDataToCurrentPosition(twm + 0x0CA0, 0xC58A);
 	_driver->loadWaveInstruments(_driver->queue()->trackData() + 8);
-	delete [] twm;
+	delete[] twm;
 	_driver->queue()->release();
 
 	return true;
@@ -1311,7 +1311,7 @@ void SoundTowns::playEuphonyTrack(uint32 offset, int loop) {
 	_parser->property(MidiParser::mpAutoLoop, loop);
 	_parser->loadMusic(twm + 0x4b70 + offset, 0xC58A);
 
-	delete [] twm;
+	delete[] twm;
 }
 
 void SoundTowns::onTimer(void * data) {
@@ -1366,7 +1366,7 @@ SoundTowns_v2::~SoundTowns_v2() {
 	/*if (_driver)
 		delete _driver;*/
 	if (_twnTrackData)
-		delete [] _twnTrackData;
+		delete[] _twnTrackData;
 }
 
 bool SoundTowns_v2::init() {
@@ -1416,7 +1416,7 @@ void SoundTowns_v2::playTrack(uint8 track) {
 		char musicfile[13];
 		sprintf(musicfile, fileListEntry(0), track);
 		if (_twnTrackData)
-			delete [] _twnTrackData;
+			delete[] _twnTrackData;
 		_twnTrackData = _vm->resource()->fileData(musicfile, 0);
 		//_driver->loadData(_twnTrackData);
 	}
@@ -1492,7 +1492,7 @@ bool SoundTowns_v2::voicePlay(const char *file, bool) {
 	_soundChannels[h].file = file;
 	_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_soundChannels[h].channelHandle, _currentSFX);
 
-	delete [] data;
+	delete[] data;
 	return true;
 }
 
-- 
cgit v1.2.3