diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/agi/preagi_mickey.cpp | 8 | ||||
-rw-r--r-- | engines/agos/agos.cpp | 8 | ||||
-rw-r--r-- | engines/lure/res.cpp | 2 | ||||
-rw-r--r-- | engines/lure/res_struct.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/dialogs.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/nut_renderer.cpp | 10 | ||||
-rw-r--r-- | engines/scumm/scumm.cpp | 6 | ||||
-rw-r--r-- | engines/scumm/smush/channel.cpp | 6 | ||||
-rw-r--r-- | engines/scumm/smush/codec37.cpp | 2 | ||||
-rw-r--r-- | engines/scumm/smush/imuse_channel.cpp | 6 | ||||
-rw-r--r-- | engines/scumm/smush/saud_channel.cpp | 2 | ||||
-rw-r--r-- | engines/scumm/smush/smush_player.cpp | 4 | ||||
-rw-r--r-- | engines/sword2/resman.cpp | 6 |
13 files changed, 34 insertions, 34 deletions
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp index 6944eee9f2..08f8969ca3 100644 --- a/engines/agi/preagi_mickey.cpp +++ b/engines/agi/preagi_mickey.cpp @@ -238,7 +238,7 @@ bool Mickey::checkMenu() { memcpy(buffer, &menu, sizeof(MSA_MENU)); getMenuSel(buffer, &iSel0, &iSel1); - delete [] buffer; + delete[] buffer; return parse(menu.cmd[iSel0].data[iSel1], menu.arg[iSel0].data[iSel1]); } @@ -645,7 +645,7 @@ void Mickey::playSound(ENUM_MSA_SOUND iSound) { case Common::EVENT_LBUTTONUP: case Common::EVENT_RBUTTONUP: case Common::EVENT_KEYDOWN: - delete [] buffer; + delete[] buffer; return; default: break; @@ -657,7 +657,7 @@ void Mickey::playSound(ENUM_MSA_SOUND iSound) { break; } - delete [] buffer; + delete[] buffer; } // Graphics @@ -893,7 +893,7 @@ void Mickey::drawLogo() { _vm->_picture->showPic(10, 10, w, h); - delete [] buffer; + delete[] buffer; } void Mickey::animate() { diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 015aff3458..a79b84843c 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -879,7 +879,7 @@ AGOSEngine::~AGOSEngine() { _midi.close(); for (uint i = 0; i < _itemHeap.size(); i++) { - delete [] _itemHeap[i]; + delete[] _itemHeap[i]; } _itemHeap.clear(); @@ -908,7 +908,7 @@ AGOSEngine::~AGOSEngine() { delete _dummyItem3; delete _dummyWindow; - delete [] _windowList; + delete[] _windowList; delete _debugger; delete _moviePlay; @@ -1017,7 +1017,7 @@ void AGOSEngine::shutdown() { _midi.close(); for (uint i = 0; i < _itemHeap.size(); i++) { - delete [] _itemHeap[i]; + delete[] _itemHeap[i]; } _itemHeap.clear(); @@ -1046,7 +1046,7 @@ void AGOSEngine::shutdown() { delete _dummyItem3; delete _dummyWindow; - delete [] _windowList; + delete[] _windowList; delete _debugger; delete _moviePlay; diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp index ce35b50243..f2997d5d17 100644 --- a/engines/lure/res.cpp +++ b/engines/lure/res.cpp @@ -85,7 +85,7 @@ void Resources::freeData() { delete _talkDialogData; delete _messagesData; delete _cursors; - delete [] _charOffsets; + delete[] _charOffsets; } struct AnimRecordTemp { diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp index fcb6b874be..913505c8c9 100644 --- a/engines/lure/res_struct.cpp +++ b/engines/lure/res_struct.cpp @@ -1008,8 +1008,8 @@ RandomActionSet::RandomActionSet(uint16 *&offset) { } RandomActionSet::~RandomActionSet() { - delete [] _types; - delete [] _ids; + delete[] _types; + delete[] _ids; } RandomActionSet *RandomActionList::getRoom(uint16 roomNumber) { diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index 5b6c2bcf35..6d1cf1bbd8 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -692,8 +692,8 @@ void HelpDialog::displayKeyBindings() { _dsc[i]->setLabel(dscStr[i]); } - delete [] keyStr; - delete [] dscStr; + delete[] keyStr; + delete[] dscStr; } void HelpDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) { diff --git a/engines/scumm/nut_renderer.cpp b/engines/scumm/nut_renderer.cpp index 71182ca7a0..d56017c6f5 100644 --- a/engines/scumm/nut_renderer.cpp +++ b/engines/scumm/nut_renderer.cpp @@ -41,8 +41,8 @@ NutRenderer::NutRenderer(ScummEngine *vm, const char *filename) : } NutRenderer::~NutRenderer() { - delete [] _charBuffer; - delete [] _decodedData; + delete[] _charBuffer; + delete[] _decodedData; } void smush_decode_codec1(byte *dst, const byte *src, int left, int top, int width, int height, int pitch); @@ -254,14 +254,14 @@ void NutRenderer::loadFont(const char *filename) { offset += (dstPitch * _chars[l].height); } - delete [] _decodedData; + delete[] _decodedData; _decodedData = compressedData; _charBuffer = new byte[_maxCharSize]; } - delete [] dataSrc; - delete [] _paletteMap; + delete[] dataSrc; + delete[] _paletteMap; } int NutRenderer::getCharWidth(byte c) const { diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index c99856b3a3..2f0593dca8 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -555,8 +555,8 @@ ScummEngine::~ScummEngine() { for (int i = 0; i < _numActors; ++i) delete _actors[i]; - delete [] _actors; - delete [] _sortedActors; + delete[] _actors; + delete[] _sortedActors; delete _2byteFontPtr; delete _charset; @@ -903,7 +903,7 @@ ScummEngine_v8::ScummEngine_v8(OSystem *syst, const DetectorResult &dr) } ScummEngine_v8::~ScummEngine_v8() { - delete [] _objectIDMap; + delete[] _objectIDMap; } #endif diff --git a/engines/scumm/smush/channel.cpp b/engines/scumm/smush/channel.cpp index 5b8cd3a853..836defd6fc 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 0c1db13a26..deabd25595 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 3a0efbc6b7..b4d261f4d1 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 17296704ea..97f86fe5d9 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 906395c0ca..ec48a09196 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; } diff --git a/engines/sword2/resman.cpp b/engines/sword2/resman.cpp index 88a1f6251a..d6b8025cda 100644 --- a/engines/sword2/resman.cpp +++ b/engines/sword2/resman.cpp @@ -191,7 +191,7 @@ bool ResourceManager::init() { if (cdInf[i].cd == 0 && !Common::File::exists((char *)cdInf[i].clusterName)) { _vm->GUIErrorMessage("Broken Sword 2: Cannot find " + Common::String((char *)cdInf[i].clusterName)); - delete [] cdInf; + delete[] cdInf; return false; } } @@ -205,7 +205,7 @@ bool ResourceManager::init() { } if (j == _totalClusters) { - delete [] cdInf; + delete[] cdInf; _vm->GUIErrorMessage(Common::String(_resFiles[i].fileName) + " is not in cd.inf"); return false; } @@ -213,7 +213,7 @@ bool ResourceManager::init() { _resFiles[i].cd = cdInf[j].cd; } - delete [] cdInf; + delete[] cdInf; debug(1, "%d resources in %d cluster files", _totalResFiles, _totalClusters); for (i = 0; i < _totalClusters; i++) |