[Scummvm-cvs-logs] scummvm master -> dc8d9f4c9f7498f501b567262d0e90229b973e6e
lordhoto
lordhoto at gmail.com
Wed Jul 25 21:13:49 CEST 2012
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c7d99c155d KYRA: Fix delete[] formatting.
93d4eb14ad MOHAWK: Fix delete[] formatting.
d98b462190 PARALLACTION: Fix delete[] formatting.
155118dc1e SWORD1: Fix delete[] formatting.
3351707b2d TOON: Fix delete[] formatting.
dc8d9f4c9f SCI: Fix delete[] formatting.
Commit: c7d99c155d28cdd609075278e94aaf91563297e4
https://github.com/scummvm/scummvm/commit/c7d99c155d28cdd609075278e94aaf91563297e4
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-25T12:09:15-07:00
Commit Message:
KYRA: Fix delete[] formatting.
Changed paths:
engines/kyra/eobcommon.cpp
engines/kyra/screen_eob.cpp
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index a63f123..fadb106 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -770,7 +770,7 @@ void EoBCoreEngine::releaseItemsAndDecorationsShapes() {
if (_spellShapes) {
for (int i = 0; i < 4; i++) {
if (_spellShapes[i])
- delete [] _spellShapes[i];
+ delete[] _spellShapes[i];
}
delete[] _spellShapes;
}
@@ -820,7 +820,7 @@ void EoBCoreEngine::releaseItemsAndDecorationsShapes() {
if (_firebeamShapes[i])
delete[] _firebeamShapes[i];
}
- delete []_firebeamShapes;
+ delete[] _firebeamShapes;
}
delete[] _redSplatShape;
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index e06ca42..ae75c11 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -607,7 +607,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool enco
srcLineStart += SCREEN_W;
src = srcLineStart;
}
- delete [] colorMap;
+ delete[] colorMap;
}
return shp;
Commit: 93d4eb14ad4a7ae1404a7c374925a7d7a6ad4143
https://github.com/scummvm/scummvm/commit/93d4eb14ad4a7ae1404a7c374925a7d7a6ad4143
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-25T12:09:46-07:00
Commit Message:
MOHAWK: Fix delete[] formatting.
Changed paths:
engines/mohawk/riven.cpp
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index e54d6fe..32613c6 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -646,7 +646,7 @@ Common::String MohawkEngine_Riven::getName(uint16 nameResource, uint16 nameID) {
}
delete nameStream;
- delete [] stringOffsets;
+ delete[] stringOffsets;
return name;
}
Commit: d98b4621908215c74fbd307044381c0e7533bb55
https://github.com/scummvm/scummvm/commit/d98b4621908215c74fbd307044381c0e7533bb55
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-25T12:10:43-07:00
Commit Message:
PARALLACTION: Fix delete[] formatting.
Changed paths:
engines/parallaction/disk_br.cpp
engines/parallaction/disk_ns.cpp
engines/parallaction/graphics.cpp
engines/parallaction/graphics.h
engines/parallaction/sound_ns.cpp
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index 5e39c89..ee981a2 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -617,7 +617,7 @@ GfxObj* AmigaDisk_br::loadStatic(const char* name) {
}
}
- delete []shadow;
+ delete[] shadow;
delete stream;
}
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index 839b2c6..8d4afd6 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -832,7 +832,7 @@ void AmigaDisk_ns::decodeCnv(byte *data, uint16 numFrames, uint16 width, uint16
assert(buf);
stream->read(buf, rawsize);
unpackBitmap(data, buf, numFrames, bytesPerPlane, height);
- delete []buf;
+ delete[] buf;
}
#undef NUM_PLANES
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 6868505..9855830 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -766,7 +766,7 @@ Gfx::~Gfx() {
freeLabels();
- delete []_unpackedBitmap;
+ delete[] _unpackedBitmap;
return;
}
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index b43dd19..f8cb4b3 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -144,7 +144,7 @@ public:
~Cnv() {
if (_freeData)
- delete []_data;
+ delete[] _data;
}
byte* getFramePtr(uint16 index) {
diff --git a/engines/parallaction/sound_ns.cpp b/engines/parallaction/sound_ns.cpp
index 3cc25b3..dcc71e4 100644
--- a/engines/parallaction/sound_ns.cpp
+++ b/engines/parallaction/sound_ns.cpp
@@ -237,7 +237,7 @@ AmigaSoundMan_ns::~AmigaSoundMan_ns() {
stopSfx(2);
stopSfx(3);
- delete []beepSoundBuffer;
+ delete[] beepSoundBuffer;
}
Audio::AudioStream *AmigaSoundMan_ns::loadChannelData(const char *filename, Channel *ch, bool looping) {
Commit: 155118dc1e85d4bbb1b678d6835d68c3e01f85f3
https://github.com/scummvm/scummvm/commit/155118dc1e85d4bbb1b678d6835d68c3e01f85f3
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-25T12:11:04-07:00
Commit Message:
SWORD1: Fix delete[] formatting.
Changed paths:
engines/sword1/sound.cpp
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index 3574074..61bf525 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -142,7 +142,7 @@ void Sound::checkSpeechFileEndianness() {
be_diff_sum += fabs((double)(be_value - prev_be_value));
prev_be_value = be_value;
}
- delete [] data;
+ delete[] data;
}
// Set the big endian flag
_bigEndianSpeech = (be_diff_sum < le_diff_sum);
Commit: 3351707b2dbaba0d6b4bd21d4f62c2653f5a9354
https://github.com/scummvm/scummvm/commit/3351707b2dbaba0d6b4bd21d4f62c2653f5a9354
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-25T12:11:22-07:00
Commit Message:
TOON: Fix delete[] formatting.
Changed paths:
engines/toon/audio.cpp
diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp
index 77822ab..bc0e0510 100644
--- a/engines/toon/audio.cpp
+++ b/engines/toon/audio.cpp
@@ -326,7 +326,7 @@ bool AudioStreamInstance::readPacket() {
}
if (numDecompressedBytes > _bufferMaxSize) {
- delete [] _buffer;
+ delete[] _buffer;
_bufferMaxSize = numDecompressedBytes;
_buffer = new int16[numDecompressedBytes];
}
Commit: dc8d9f4c9f7498f501b567262d0e90229b973e6e
https://github.com/scummvm/scummvm/commit/dc8d9f4c9f7498f501b567262d0e90229b973e6e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-07-25T12:11:45-07:00
Commit Message:
SCI: Fix delete[] formatting.
Changed paths:
engines/sci/graphics/font.cpp
diff --git a/engines/sci/graphics/font.cpp b/engines/sci/graphics/font.cpp
index fcdd057..30184cc 100644
--- a/engines/sci/graphics/font.cpp
+++ b/engines/sci/graphics/font.cpp
@@ -54,7 +54,7 @@ GfxFontFromResource::GfxFontFromResource(ResourceManager *resMan, GfxScreen *scr
}
GfxFontFromResource::~GfxFontFromResource() {
- delete []_chars;
+ delete[] _chars;
_resMan->unlockResource(_resource);
}
More information about the Scummvm-git-logs
mailing list