[Scummvm-cvs-logs] scummvm master -> c22ca8ffb515b03712a0f0e36dd40c7e38c4b8ed
sev-
sev at scummvm.org
Sun May 15 13:19:51 CEST 2016
This automated email contains information about 11 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
05419d7c35 SCUMM HE: Hid another noisy debug message
8d611a061e SCUMM HE: Show stub warnings
384e45424e SCUMM HE: Document o100_arrayOps()
33184e822d AUDIO: Plug potential memory leak
20433e3476 ACCESS: Plug memory leak
1b7bb9ee6d ACCESS: Plug memory leak
a3d1ecb7d1 JANITORIAL: Remove trailing spaces
6858dbe2c2 ACCESS: Fix memory leak
7526cf82f2 FULLPIPE: Plug memory leak
9909cc615d KYRA: Plug memory leak
c22ca8ffb5 KYRA: Plug memory leak
Commit: 05419d7c354ab4befd132f8c7b254336ec0578bf
https://github.com/scummvm/scummvm/commit/05419d7c354ab4befd132f8c7b254336ec0578bf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-15T10:54:59+02:00
Commit Message:
SCUMM HE: Hid another noisy debug message
Changed paths:
engines/scumm/he/sprite_he.cpp
diff --git a/engines/scumm/he/sprite_he.cpp b/engines/scumm/he/sprite_he.cpp
index 4044d8a..e3f04df 100644
--- a/engines/scumm/he/sprite_he.cpp
+++ b/engines/scumm/he/sprite_he.cpp
@@ -746,12 +746,10 @@ void Sprite::setSpriteZBuffer(int spriteId, int value) {
}
void Sprite::setSpriteGeneralProperty(int spriteId, int type, int value) {
- debug(0, "setSpriteGeneralProperty: spriteId %d type 0x%x value 0x%x", spriteId, type, value);
+ debug(6, "setSpriteGeneralProperty: spriteId %d type 0x%x value 0x%x", spriteId, type, value);
assertRange(1, spriteId, _varNumSprites, "sprite");
int32 delay;
- // XXX U32 related check
-
switch (type) {
case 0x7B:
_spriteTable[spriteId].imgFlags = value;
Commit: 8d611a061e4e8369d524048123ebaf9d5a010fc5
https://github.com/scummvm/scummvm/commit/8d611a061e4e8369d524048123ebaf9d5a010fc5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-15T10:56:12+02:00
Commit Message:
SCUMM HE: Show stub warnings
Changed paths:
engines/scumm/he/script_v100he.cpp
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index 5937702..1caa569 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -659,7 +659,7 @@ void ScummEngine_v100he::o100_arrayOps() {
default:
error("o100_arrayOps: case 132 unknown type %d)", type);
}
- debug(0, "o100_arrayOps: case 132 type %d", type);
+ warning("STUB: o100_arrayOps: case 132 type %d", type);
break;
case 133:
b = pop();
@@ -1110,6 +1110,7 @@ void ScummEngine_v100he::o100_resourceRoutines() {
break;
case 128:
// TODO: Clear Heap
+ warning("STUB: o100_resourceRoutines: clear Heap");
break;
case 129:
// Dummy case
@@ -2472,6 +2473,7 @@ void ScummEngine_v100he::o100_getSpriteGroupInfo() {
pop();
pop();
push(0);
+ warning("STUB: o100_getSpriteGroupInfo, subop 54");
break;
case 59:
spriteGroupId = pop();
Commit: 384e45424e4b6a0ad9d8bd3dc8cb0b82c591be1d
https://github.com/scummvm/scummvm/commit/384e45424e4b6a0ad9d8bd3dc8cb0b82c591be1d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-15T10:56:42+02:00
Commit Message:
SCUMM HE: Document o100_arrayOps()
Changed paths:
engines/scumm/he/script_v100he.cpp
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
index 1caa569..4388433 100644
--- a/engines/scumm/he/script_v100he.cpp
+++ b/engines/scumm/he/script_v100he.cpp
@@ -549,20 +549,20 @@ void ScummEngine_v100he::o100_arrayOps() {
debug(9,"o100_arrayOps: array %d case %d", array, subOp);
switch (subOp) {
- case 35:
+ case 35: // SO_FORMATTED_STRING
decodeScriptString(string);
len = resStrLen(string);
data = defineArray(array, kStringArray, 0, 0, 0, len);
memcpy(data, string, len);
break;
- case 77: // SO_ASSIGN_STRING
+ case 77: // SO_STRING
copyScriptString(string, sizeof(string));
len = resStrLen(string);
data = defineArray(array, kStringArray, 0, 0, 0, len);
memcpy(data, string, len);
break;
- case 128: // SO_ASSIGN_2DIM_LIST
+ case 128: // SO_ASSIGN_2DIM_LIST
len = getStackList(list, ARRAYSIZE(list));
id = readVar(array);
if (id == 0)
@@ -572,7 +572,7 @@ void ScummEngine_v100he::o100_arrayOps() {
writeArray(array, c, len, list[len]);
}
break;
- case 129: // SO_ASSIGN_INT_LIST
+ case 129: // SO_ASSIGN_INT_LIST
b = pop();
c = pop();
id = readVar(array);
@@ -583,7 +583,7 @@ void ScummEngine_v100he::o100_arrayOps() {
writeArray(array, 0, b + c, pop());
}
break;
- case 130:
+ case 130: //
len = getStackList(list, ARRAYSIZE(list));
dim1end = pop();
dim1start = pop();
@@ -607,7 +607,7 @@ void ScummEngine_v100he::o100_arrayOps() {
dim2start++;
}
break;
- case 131:
+ case 131: // SO_COMPLEX_ARRAY_COPY_OPERATION
{
int a2_dim1end = pop();
int a2_dim1start = pop();
@@ -624,7 +624,7 @@ void ScummEngine_v100he::o100_arrayOps() {
copyArray(array, a1_dim2start, a1_dim2end, a1_dim1start, a1_dim1end, array2, a2_dim2start, a2_dim2end, a2_dim1start, a2_dim1end);
}
break;
- case 132:
+ case 132: // SO_COMPLEX_ARRAY_MATH_OPERATION
// TODO: Used by room 2 script 2180 in Moonbase Commander
fetchScriptWord();
fetchScriptWord();
@@ -661,7 +661,7 @@ void ScummEngine_v100he::o100_arrayOps() {
}
warning("STUB: o100_arrayOps: case 132 type %d", type);
break;
- case 133:
+ case 133: // SO_RANGE_ARRAY_ASSIGNMENT
b = pop();
c = pop();
dim1end = pop();
Commit: 33184e822dfdbc083c472cba5e1bf4f0f9a25243
https://github.com/scummvm/scummvm/commit/33184e822dfdbc083c472cba5e1bf4f0f9a25243
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-15T12:26:15+02:00
Commit Message:
AUDIO: Plug potential memory leak
Changed paths:
audio/decoders/aiff.cpp
diff --git a/audio/decoders/aiff.cpp b/audio/decoders/aiff.cpp
index e1949eb..253b36d 100644
--- a/audio/decoders/aiff.cpp
+++ b/audio/decoders/aiff.cpp
@@ -129,6 +129,8 @@ RewindableAudioStream *makeAIFFStream(Common::SeekableReadStream *stream, Dispos
foundSSND = true;
/* uint32 offset = */ stream->readUint32BE();
/* uint32 blockAlign = */ stream->readUint32BE();
+ if (dataStream)
+ delete dataStream;
dataStream = new Common::SeekableSubReadStream(stream, stream->pos(), stream->pos() + length - 8, disposeAfterUse);
break;
case MKTAG('F', 'V', 'E', 'R'):
@@ -154,7 +156,7 @@ RewindableAudioStream *makeAIFFStream(Common::SeekableReadStream *stream, Dispos
return 0;
default:
debug(1, "Skipping AIFF '%s' chunk", tag2str(tag));
- break;
+ break;
}
stream->seek(pos + length + (length & 1)); // ensure we're also word-aligned
@@ -203,7 +205,7 @@ RewindableAudioStream *makeAIFFStream(Common::SeekableReadStream *stream, Dispos
if (codec == MKTAG('s', 'o', 'w', 't'))
rawFlags |= Audio::FLAG_LITTLE_ENDIAN;
- return makeRawStream(dataStream, rate, rawFlags);
+ return makeRawStream(dataStream, rate, rawFlags);
}
case MKTAG('i', 'm', 'a', '4'):
// TODO: Use QT IMA ADPCM
@@ -212,7 +214,7 @@ RewindableAudioStream *makeAIFFStream(Common::SeekableReadStream *stream, Dispos
case MKTAG('Q', 'D', 'M', '2'):
// TODO: Need to figure out how to integrate this
// (But hopefully never needed)
- warning("Unhandled AIFF-C QDM2 compression");
+ warning("Unhandled AIFF-C QDM2 compression");
break;
case MKTAG('A', 'D', 'P', '4'):
// ADP4 on 3DO
Commit: 20433e3476f9a6c6e22ba8f11e8963b2c78a03bb
https://github.com/scummvm/scummvm/commit/20433e3476f9a6c6e22ba8f11e8963b2c78a03bb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-15T12:29:35+02:00
Commit Message:
ACCESS: Plug memory leak
Changed paths:
engines/access/char.cpp
diff --git a/engines/access/char.cpp b/engines/access/char.cpp
index cbe1d5d..f6d3033 100644
--- a/engines/access/char.cpp
+++ b/engines/access/char.cpp
@@ -44,7 +44,7 @@ CharEntry::CharEntry(const byte *data, AccessEngine *vm) {
if (vm->getGameID() == GType_MartianMemorandum) {
int lastColor = s.readUint16LE();
_numColors = lastColor - _startColor;
- } else
+ } else
_numColors = s.readUint16LE();
// Load cells
@@ -131,6 +131,7 @@ void CharManager::loadChar(int charId) {
if (ce._animFile._fileNum != -1) {
Resource *data = _vm->_files->loadFile(ce._animFile);
_vm->_animation->loadAnimations(data);
+ delete data;
}
// Load script data
Commit: 1b7bb9ee6db6ee4bd48054680eb8460bf63c9796
https://github.com/scummvm/scummvm/commit/1b7bb9ee6db6ee4bd48054680eb8460bf63c9796
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-15T12:30:52+02:00
Commit Message:
ACCESS: Plug memory leak
Changed paths:
engines/access/room.cpp
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index a7192d3..a41de63 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -142,7 +142,7 @@ void Room::takePicture() {
_vm->_player->_roomNumber = 7;
_vm->_room->_function = FN_CLEAR1;
return;
- } else if (result >= 0)
+ } else if (result >= 0)
_vm->_player->_move = (Direction)(result + 1);
_vm->_player->_scrollFlag = false;
@@ -715,6 +715,8 @@ void Room::executeCommand(int commandId) {
screen.plotImage(spr, _selectCommand + 2,
Common::Point(_rMouse[_selectCommand][0], (_vm->getGameID() == GType_MartianMemorandum) ? 184 : 176));
+ delete spr;
+
_vm->_screen->restoreScreen();
_vm->_boxSelect = true;
}
Commit: a3d1ecb7d12d8bdc71cc58e8911eca943e2c27f9
https://github.com/scummvm/scummvm/commit/a3d1ecb7d12d8bdc71cc58e8911eca943e2c27f9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-15T12:34:32+02:00
Commit Message:
JANITORIAL: Remove trailing spaces
Changed paths:
engines/access/bubble_box.cpp
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index ef32e96..f41670b 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -165,7 +165,7 @@ void BubbleBox::printBubble(const Common::String &msg) {
void BubbleBox::printBubble_v1(const Common::String &msg) {
drawBubble(_bubbles.size() - 1);
-
+
// Loop through drawing the lines
Common::String s = msg;
Common::String line;
@@ -369,7 +369,7 @@ void BubbleBox::displayBoxData() {
_vm->_screen->drawRect();
_vm->_events->showCursor();
}
-
+
_vm->_events->hideCursor();
int oldPStartY = _boxPStartY;
++_boxPStartY;
@@ -474,7 +474,7 @@ int BubbleBox::doBox_v1(int item, int box, int &btnSelected) {
--_vm->_screen->_orgX2;
--_vm->_screen->_orgY2;
_vm->_screen->_lColor = 0xF9;
-
+
// Draw the inner border
_vm->_screen->drawBox();
@@ -732,7 +732,7 @@ int BubbleBox::doBox_v1(int item, int box, int &btnSelected) {
if (_type != TYPE_3)
continue;
-
+
if ((_vm->_events->_mousePos.x < tmpX) || (_vm->_events->_mousePos.x > tmpX + 144))
continue;
Commit: 6858dbe2c283615f358af3be357aca452e34cf39
https://github.com/scummvm/scummvm/commit/6858dbe2c283615f358af3be357aca452e34cf39
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-15T12:35:23+02:00
Commit Message:
ACCESS: Fix memory leak
Changed paths:
engines/access/bubble_box.cpp
diff --git a/engines/access/bubble_box.cpp b/engines/access/bubble_box.cpp
index f41670b..89c5d07 100644
--- a/engines/access/bubble_box.cpp
+++ b/engines/access/bubble_box.cpp
@@ -642,7 +642,9 @@ int BubbleBox::doBox_v1(int item, int box, int &btnSelected) {
}
}
}
-
+
+ delete icons;
+
_vm->_screen->restoreScreen();
_vm->_boxDataStart = _startItem;
_vm->_boxSelectYOld = -1;
Commit: 7526cf82f2279698aecb48aacc97849bed3d410b
https://github.com/scummvm/scummvm/commit/7526cf82f2279698aecb48aacc97849bed3d410b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-15T13:07:23+02:00
Commit Message:
FULLPIPE: Plug memory leak
Changed paths:
engines/access/inventory.cpp
engines/fullpipe/motion.cpp
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 0a962aa..e9874cd 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -223,6 +223,7 @@ int InventoryManager::displayInv() {
else
_vm->_useItem = -1;
+ free(names);
free(inv);
return 0;
}
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 1a61cb7..9cf18f3 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -855,9 +855,9 @@ Common::Array<MovItem *> *MovGraph::getPaths(StaticANIObject *ani, int x, int y,
if (sz > 0) {
for (int j = 0; j < sz; j++)
_items[idx]->movitems->push_back(movitems[j]);
-
- delete movitems;
}
+
+ delete movitems;
}
delete movarr;
Commit: 9909cc615d527bc8d43f930d8c88dc014974f2de
https://github.com/scummvm/scummvm/commit/9909cc615d527bc8d43f930d8c88dc014974f2de
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-15T13:14:37+02:00
Commit Message:
KYRA: Plug memory leak
Changed paths:
engines/kyra/resource_intern.cpp
diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp
index 9ec9554..75e98d3 100644
--- a/engines/kyra/resource_intern.cpp
+++ b/engines/kyra/resource_intern.cpp
@@ -1180,6 +1180,8 @@ Common::Archive *InstallerLoader::load(Resource *owner, const Common::String &fi
delete tmpFile;
tmpFile = 0;
}
+ delete[] outbuffer;
+ outbuffer = 0;
}
archives.clear();
Commit: c22ca8ffb515b03712a0f0e36dd40c7e38c4b8ed
https://github.com/scummvm/scummvm/commit/c22ca8ffb515b03712a0f0e36dd40c7e38c4b8ed
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-15T13:19:27+02:00
Commit Message:
KYRA: Plug memory leak
Changed paths:
engines/kyra/staticres.cpp
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 1a2e2c0..8ad02c7 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -839,6 +839,8 @@ void KyraEngine_LoK::initStaticResource() {
_sound->initAudioResourceInfo(kMusicIntro, &resInfoIntro);
_sound->initAudioResourceInfo(kMusicIngame, &resInfoIngame);
}
+
+ delete[] soundFiles;
}
void KyraEngine_LoK::loadMouseShapes() {
More information about the Scummvm-git-logs
mailing list