Formatting.

svn-id: r35908

4 files changed, 98 insertions, 98 deletions

diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 4c41df60be..23a3307142 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -160,91 +160,91 @@ LoLEngine::~LoLEngine() {
 	delete _screen;
 	delete _tim;
 
-	delete [] _itemsInPlay;
-	delete [] _itemProperties;
+	delete[]  _itemsInPlay;
+	delete[]  _itemProperties;
 
-	delete [] _characters;
+	delete[]  _characters;
 
 	if (_itemIconShapes) {
 		for (int i = 0; i < _numItemIconShapes; i++)
-			delete [] _itemIconShapes[i];
-		delete []_itemIconShapes;
+			delete[]  _itemIconShapes[i];
+		delete[] _itemIconShapes;
 	}
 	if (_itemShapes) {
 		for (int i = 0; i < _numItemShapes; i++)
-			delete [] _itemShapes[i];
-		delete []_itemShapes;
+			delete[]  _itemShapes[i];
+		delete[] _itemShapes;
 	}
 	if (_gameShapes) {
 		for (int i = 0; i < _numGameShapes; i++)
-			delete [] _gameShapes[i];
-		delete []_gameShapes;
+			delete[]  _gameShapes[i];
+		delete[] _gameShapes;
 	}
 	if (_thrownShapes) {
 		for (int i = 0; i < _numThrownShapes; i++)
-			delete [] _thrownShapes[i];
-		delete []_thrownShapes;
+			delete[]  _thrownShapes[i];
+		delete[] _thrownShapes;
 	}
 	if (_iceShapes) {
 		for (int i = 0; i < _numIceShapes; i++)
-			delete [] _iceShapes[i];
-		delete []_iceShapes;
+			delete[]  _iceShapes[i];
+		delete[] _iceShapes;
 	}
 	if (_fireballShapes) {
 		for (int i = 0; i < _numFireballShapes; i++)
-			delete [] _fireballShapes[i];
-		delete []_fireballShapes;
+			delete[]  _fireballShapes[i];
+		delete[] _fireballShapes;
 	}
 
 	if (_monsterShapes) {
 		for (int i = 0; i < 48; i++)
-			delete [] _monsterShapes[i];
-		delete []_monsterShapes;
+			delete[]  _monsterShapes[i];
+		delete[] _monsterShapes;
 	}
 	if (_monsterPalettes) {
 		for (int i = 0; i < 48; i++)
-			delete [] _monsterPalettes[i];
-		delete []_monsterPalettes;
+			delete[]  _monsterPalettes[i];
+		delete[] _monsterPalettes;
 	}
 	if (_buf4) {
 		for (int i = 0; i < 384; i++)
-			delete [] _buf4[i];
-		delete []_buf4;
+			delete[]  _buf4[i];
+		delete[] _buf4;
 	}
 
 	for (Common::Array<const TIMOpcode*>::iterator i = _timIntroOpcodes.begin(); i != _timIntroOpcodes.end(); ++i)
 		delete *i;
 	_timIntroOpcodes.clear();
 
-	delete []_wllVmpMap;
-	delete []_wllShapeMap;
-	delete []_wllBuffer3;
-	delete []_wllBuffer4;
-	delete []_wllBuffer5;
-	delete []_lvlShapeTop;
-	delete []_lvlShapeBottom;
-	delete []_lvlShapeLeftRight;
-	delete []_tempBuffer5120;
-	delete []_lvlBuffer;
-	delete []_cmzBuffer;
-	delete []_lvl415;
-
-	delete []_lvlShpHeader;
-	delete []_levelFileData;
-	delete []_vcnExpTable;
-	delete []_vcnBlocks;
-	delete []_vcnShift;
-	delete []_vmpPtr;
-	delete []_tlcTable2;
-	delete []_tlcTable1;
-	delete []_levelShapeProperties;
-	delete []_blockDrawingBuffer;
-	delete []_sceneWindowBuffer;
+	delete[] _wllVmpMap;
+	delete[] _wllShapeMap;
+	delete[] _wllBuffer3;
+	delete[] _wllBuffer4;
+	delete[] _wllBuffer5;
+	delete[] _lvlShapeTop;
+	delete[] _lvlShapeBottom;
+	delete[] _lvlShapeLeftRight;
+	delete[] _tempBuffer5120;
+	delete[] _lvlBuffer;
+	delete[] _cmzBuffer;
+	delete[] _lvl415;
+
+	delete[] _lvlShpHeader;
+	delete[] _levelFileData;
+	delete[] _vcnExpTable;
+	delete[] _vcnBlocks;
+	delete[] _vcnShift;
+	delete[] _vmpPtr;
+	delete[] _tlcTable2;
+	delete[] _tlcTable1;
+	delete[] _levelShapeProperties;
+	delete[] _blockDrawingBuffer;
+	delete[] _sceneWindowBuffer;
 
 	if (_levelShapes) {
 		for (int i = 0; i < 400; i++)
-			delete [] _levelShapes[i];
-		delete []_levelShapes;
+			delete[]  _levelShapes[i];
+		delete[] _levelShapes;
 	}
 
 	for (int i = 0; i < 2; i++)
@@ -254,8 +254,8 @@ LoLEngine::~LoLEngine() {
 
 	if (_ingameSoundList) {
 		for (int i = 0; i < _ingameSoundListSize; i++)
-			delete []_ingameSoundList[i];
-		delete []_ingameSoundList;	
+			delete[] _ingameSoundList[i];
+		delete[] _ingameSoundList;	
 	}
 }
 
@@ -569,7 +569,7 @@ void LoLEngine::startup() {
 	_screen->generateOverlay(_screen->_currentPalette, _screen->_paletteOverlay1, 1, 6);
 	_screen->generateOverlay(_screen->_currentPalette, _screen->_paletteOverlay2, 0x90, 0x41);
 	memcpy(_screen->_currentPalette, tmpPal, 0x300);
-	delete []tmpPal;
+	delete[] tmpPal;
 
 	memset(_screen->getPalette(1), 0, 0x300);
 	memset(_screen->getPalette(2), 0, 0x300);
diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp
index 22da827c8b..0fa984b522 100644
--- a/engines/kyra/scene_lol.cpp
+++ b/engines/kyra/scene_lol.cpp
@@ -41,7 +41,7 @@ void LoLEngine::loadLevel(int index) {
 	updatePortraits();
 
 	for (int i = 0; i < 400; i++) {
-		delete [] _levelShapes[i];
+		delete[] _levelShapes[i];
 		_levelShapes[i] = 0;
 	}
 
@@ -293,7 +293,7 @@ void LoLEngine::loadLevelWLL(int index, bool mapShapes) {
 		d += 2;		
 	}
 
-	delete []file;
+	delete[] file;
 
 	delete _lvlShpFileHandle;
 	_lvlShpFileHandle = 0;	
@@ -394,7 +394,7 @@ void LoLEngine::loadLevelCMZ(int index) {
 		
 	loadCMZ_Sub(tmpLvlVal, (_unkGameFlag & 0x30) >> 4);
 
-	delete []cmzdata;
+	delete[] cmzdata;
 }
 
 void LoLEngine::loadCMZ_Sub(int index1, int index2) {
@@ -519,22 +519,22 @@ void LoLEngine::loadMonsterShapes(const char *file, int monsterIndex, int b) {
 		}
 	}
 
-	delete []tmpPal1;
-	delete []tmpPal2;
-	delete []tmpPal3;
-	delete [] tsh;
+	delete[] tmpPal1;
+	delete[] tmpPal2;
+	delete[] tmpPal3;
+	delete[]  tsh;
 }
 
 void LoLEngine::releaseMonsterShapes(int monsterIndex) {
 	for (int i = 0; i < 16; i++) {
 		int pos = (monsterIndex << 4) + i;
 		if (_monsterShapes[pos]) {
-			delete []_monsterShapes[pos];
+			delete[] _monsterShapes[pos];
 			_monsterShapes[pos] = 0;
 		}
 
 		if (_monsterPalettes[pos]) {
-			delete []_monsterPalettes[pos];
+			delete[] _monsterPalettes[pos];
 			_monsterPalettes[pos] = 0;
 		}		
 	}
@@ -545,7 +545,7 @@ void LoLEngine::loadLevelShpDat(const char *shpFile, const char *datFile, bool f
 
 	_lvlShpFileHandle = _res->getFileStream(shpFile);
 	_lvlShpNum = _lvlShpFileHandle->readUint16LE();
-	delete []_lvlShpHeader;
+	delete[] _lvlShpHeader;
 	_lvlShpHeader = new uint32[_lvlShpNum];
 	for (int i = 0; i < _lvlShpNum; i++)
 		_lvlShpHeader[i] = _lvlShpFileHandle->readUint32LE();
@@ -553,7 +553,7 @@ void LoLEngine::loadLevelShpDat(const char *shpFile, const char *datFile, bool f
 	Common::SeekableReadStream *s = _res->getFileStream(datFile);
 
 	_levelFileDataSize = s->readUint16LE();
-	delete []_levelFileData;
+	delete[] _levelFileData;
 	_levelFileData = new LevelShapeProperty[_levelFileDataSize];
 	for (int i = 0; i < _levelFileDataSize; i++) {
 		LevelShapeProperty * l = &_levelFileData[i];
@@ -602,11 +602,11 @@ void LoLEngine::loadLevelSupplemenaryFiles(const char *file, int specialColor, i
 		vcnLen = tlen << 5;
 
 	if (_vcnBlocks)
-		delete []_vcnBlocks;
+		delete[] _vcnBlocks;
 	_vcnBlocks = new uint8[vcnLen];
 
 	if (_vcnShift)
-		delete []_vcnShift;
+		delete[] _vcnShift;
 	_vcnShift = new uint8[tlen];
 
 	memcpy(_vcnShift, v, tlen);
@@ -617,7 +617,7 @@ void LoLEngine::loadLevelSupplemenaryFiles(const char *file, int specialColor, i
 	
 	if (_lastSuppLangFilePtr) {
 		if (_levelLangFile)
-			delete []_levelLangFile;
+			delete[] _levelLangFile;
 		_levelLangFile = _res->fileData(_lastSuppLangFilePtr, 0);
 	}
 
@@ -642,7 +642,7 @@ void LoLEngine::loadLevelSupplemenaryFiles(const char *file, int specialColor, i
 	v += 2;
 
 	if (_vmpPtr)
-		delete []_vmpPtr;
+		delete[] _vmpPtr;
 	_vmpPtr = new uint16[vmpLen];
 
 	for (int i = 0; i < vmpLen; i++)
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp
index 4d78203d32..a7be3e5371 100644
--- a/engines/kyra/screen_lol.cpp
+++ b/engines/kyra/screen_lol.cpp
@@ -49,14 +49,14 @@ Screen_LoL::Screen_LoL(LoLEngine *vm, OSystem *system) : Screen_v2(vm, system),
 Screen_LoL::~Screen_LoL() {
 	for (int i = 0; i < _screenDimTableCount; i++)
 		delete _customDimTable[i];
-	delete []_customDimTable;
+	delete[] _customDimTable;
 
 	for (int i = 0; i < 8; i++)
-		delete []_levelOverlays[i];
+		delete[] _levelOverlays[i];
 
-	delete []_paletteOverlay1;
-	delete []_paletteOverlay2;
-	delete []_grayOverlay;
+	delete[] _paletteOverlay1;
+	delete[] _paletteOverlay2;
+	delete[] _grayOverlay;
 }
 
 void Screen_LoL::setScreenDim(int dim) {
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index 5edf662bd4..0417d4dfc5 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -1539,7 +1539,7 @@ private:
 class TownsPC98_OpnPercussionSource {
 public:
 	TownsPC98_OpnPercussionSource(const uint32 timerbase);
-	~TownsPC98_OpnPercussionSource() { delete [] _reg; }
+	~TownsPC98_OpnPercussionSource() { delete[] _reg; }
 
 	void init(const uint8 *instrData = 0);
 	void reset();
@@ -2577,9 +2577,9 @@ TownsPC98_OpnSquareSineSource::TownsPC98_OpnSquareSineSource(const uint32 timerb
 }
 
 TownsPC98_OpnSquareSineSource::~TownsPC98_OpnSquareSineSource() {
-	delete [] _tlTable;
-	delete [] _tleTable;
-	delete [] _reg;
+	delete[] _tlTable;
+	delete[] _tleTable;
+	delete[] _reg;
 }
 
 void TownsPC98_OpnSquareSineSource::init(const int *rsTable, const int *rseTable) {
@@ -2588,8 +2588,8 @@ void TownsPC98_OpnSquareSineSource::init(const int *rsTable, const int *rseTable
 		return;
 	}
 
-	delete [] _tlTable;
-	delete [] _tleTable;
+	delete[] _tlTable;
+	delete[] _tleTable;
 	_tlTable = new int32[16];
 	_tleTable = new int32[32];
 	float a, b, d;
@@ -2938,15 +2938,15 @@ TownsPC98_OpnCore::~TownsPC98_OpnCore() {
 	_mixer->stopHandle(_soundHandle);
 	delete _ssg;
 	delete _prc;
-	delete [] _chanInternal;
+	delete[] _chanInternal;
 
-	delete [] _oprRates;
-	delete [] _oprRateshift;
-	delete [] _oprFrq;
-	delete [] _oprAttackDecay;
-	delete [] _oprSinTbl;
-	delete [] _oprLevelOut;
-	delete [] _oprDetune;
+	delete[] _oprRates;
+	delete[] _oprRateshift;
+	delete[] _oprFrq;
+	delete[] _oprAttackDecay;
+	delete[] _oprSinTbl;
+	delete[] _oprLevelOut;
+	delete[] _oprDetune;
 }
 
 bool TownsPC98_OpnCore::init() {
@@ -3224,12 +3224,12 @@ int inline TownsPC98_OpnCore::readBuffer(int16 *buffer, const int numSamples) {
 		tmp += (render << 1);
 	}
 
-	delete [] tmpStart;
+	delete[] tmpStart;
 	return numSamples;
 }
 
 void TownsPC98_OpnCore::generateTables() {
-	delete [] _oprRates;
+	delete[] _oprRates;
 	_oprRates = new uint8[128];
 	memset(_oprRates, 0x90, 32);
 	uint8 *dst = (uint8*) _oprRates + 32;
@@ -3242,7 +3242,7 @@ void TownsPC98_OpnCore::generateTables() {
 	}
 	memset(dst, 0x80, 32);
 
-	delete [] _oprRateshift;
+	delete[] _oprRateshift;
 	_oprRateshift = new uint8[128];
 	memset(_oprRateshift, 0, 128);
 	dst = (uint8*) _oprRateshift + 32;
@@ -3251,18 +3251,18 @@ void TownsPC98_OpnCore::generateTables() {
 		dst += 4;
 	}
 
-	delete [] _oprFrq;
+	delete[] _oprFrq;
 	_oprFrq = new uint32[0x1000];
 	for (uint32 i = 0; i < 0x1000; i++)
 		_oprFrq[i] = (uint32)(_baserate * (float)(i << 11));
 
-	delete [] _oprAttackDecay;
+	delete[] _oprAttackDecay;
 	_oprAttackDecay = new uint8[152];
 	memset(_oprAttackDecay, 0, 152);
 	for (int i = 0; i < 36; i++)
 		WRITE_BE_UINT32(_oprAttackDecay + (i << 2), _adtStat[i]);
 
-	delete [] _oprSinTbl;
+	delete[] _oprSinTbl;
 	_oprSinTbl = new uint32[1024];
 	for (int i = 0; i < 1024; i++) {
 		double val = sin((double) (((i << 1) + 1) * PI / 1024.0));
@@ -3272,7 +3272,7 @@ void TownsPC98_OpnCore::generateTables() {
 		_oprSinTbl[i] = (i_dcb << 1) + (val >= 0.0 ? 0 : 1);
 	}
 
-	delete [] _oprLevelOut;
+	delete[] _oprLevelOut;
 	_oprLevelOut = new int32[0x1a00];
 	for (int i = 0; i < 256; i++) {
 		double val = floor(65536.0 / pow(2.0, 0.00390625 * (double)(1 + i)));
@@ -3290,14 +3290,14 @@ void TownsPC98_OpnCore::generateTables() {
 	memset(dtt + 36, 1, 8);
 	memcpy(dtt + 44, _detSrc, 84);
 
-	delete [] _oprDetune;
+	delete[] _oprDetune;
 	_oprDetune = new int32[256];
 	for (int i = 0; i < 128; i++) {
 		_oprDetune[i] = (int32)	((float)dtt[i] * _baserate * 64.0);
 		_oprDetune[i + 128] = -_oprDetune[i];
 	}
 
-	delete [] dtt;
+	delete[] dtt;
 }
 
 void TownsPC98_OpnCore::nextTick(int32 *buffer, uint32 bufferSize) {
@@ -3413,25 +3413,25 @@ TownsPC98_OpnDriver::~TownsPC98_OpnDriver() {
 	if (_channels) {
 		for (int i = 0; i < _numChan; i++)
 			delete _channels[i];
-		delete [] _channels;
+		delete[] _channels;
 	}
 
 	if (_ssgChannels) {
 		for (int i = 0; i < _numSSG; i++)
 			delete _ssgChannels[i];
-		delete [] _ssgChannels;
+		delete[] _ssgChannels;
 	}
 
 	if (_sfxChannels) {
 		for (int i = 0; i < 2; i++)
 			delete _sfxChannels[i];
-		delete [] _sfxChannels;
+		delete[] _sfxChannels;
 	}
 
 	if (_rhythmChannel)
 		delete _rhythmChannel;
 
-	delete [] _ssgPatches;
+	delete[] _ssgPatches;
 }
 
 bool TownsPC98_OpnDriver::init() {
@@ -4144,7 +4144,7 @@ bool SoundTownsPC98_v2::init() {
 }
 
 void SoundTownsPC98_v2::loadSoundFile(Common::String file) {
-	delete [] _sfxTrackData;
+	delete[] _sfxTrackData;
 	_sfxTrackData = _vm->resource()->fileData(file.c_str(), 0);
 }