[Scummvm-cvs-logs] scummvm master -> ec6a9d28727071c73e7de113d0530a71ef24b7d6
bluegr
md5 at scummvm.org
Thu Nov 3 23:44:23 CET 2011
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
cdedfa3d85 SCI: Removed a duplicate variable assignment
747ebffd17 SCUMM: Removed a duplicate variable assignment
e4d1a5da3d QDM2: Removed superfluous parentheses
b849f5485f CRUISE: Removed duplicate variable assignment
ec6a9d2872 TSAGE: Removed duplicate assignments
Commit: cdedfa3d8552f81a1ff9cae0d21d03964b9ca2a3
https://github.com/scummvm/scummvm/commit/cdedfa3d8552f81a1ff9cae0d21d03964b9ca2a3
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-03T15:42:37-07:00
Commit Message:
SCI: Removed a duplicate variable assignment
Changed paths:
engines/sci/sound/drivers/adlib.cpp
diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp
index add3d88..db9317e 100644
--- a/engines/sci/sound/drivers/adlib.cpp
+++ b/engines/sci/sound/drivers/adlib.cpp
@@ -613,8 +613,6 @@ void MidiDriver_AdLib::setNote(int voice, int note, bool key) {
_voices[voice].note = note;
- delta = 0;
-
n = note % 12;
if (bend < 8192)
Commit: 747ebffd17eb64423fd8fb321f9d803ec31105f4
https://github.com/scummvm/scummvm/commit/747ebffd17eb64423fd8fb321f9d803ec31105f4
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-03T15:42:38-07:00
Commit Message:
SCUMM: Removed a duplicate variable assignment
Changed paths:
engines/scumm/imuse/imuse_player.cpp
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index 73be217..d733a26 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -592,12 +592,12 @@ bool Player::setLoop(uint count, uint tobeat, uint totick, uint frombeat, uint f
if (tobeat == 0)
tobeat = 1;
- _loop_counter = 0; // Because of possible interrupts
+ //_loop_counter = 0; // Because of possible interrupts
+ _loop_counter = count;
_loop_to_beat = tobeat;
_loop_to_tick = totick;
_loop_from_beat = frombeat;
_loop_from_tick = fromtick;
- _loop_counter = count;
return true;
}
Commit: e4d1a5da3d4e69c59a769a728d29ec67a2c4f3d7
https://github.com/scummvm/scummvm/commit/e4d1a5da3d4e69c59a769a728d29ec67a2c4f3d7
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-03T15:42:40-07:00
Commit Message:
QDM2: Removed superfluous parentheses
Changed paths:
audio/decoders/qdm2.cpp
diff --git a/audio/decoders/qdm2.cpp b/audio/decoders/qdm2.cpp
index 19b30217..113b88f 100644
--- a/audio/decoders/qdm2.cpp
+++ b/audio/decoders/qdm2.cpp
@@ -1832,7 +1832,7 @@ QDM2Stream::QDM2Stream(Common::SeekableReadStream *extraData, DisposeAfterUse::F
_subSampling = _fftOrder - 7;
_frequencyRange = 255 / (1 << (2 - _subSampling));
- switch ((_subSampling * 2 + _channels - 1)) {
+ switch (_subSampling * 2 + _channels - 1) {
case 0:
tmp = 40;
break;
Commit: b849f5485f59cb9896ad66c7f8b1b44678011554
https://github.com/scummvm/scummvm/commit/b849f5485f59cb9896ad66c7f8b1b44678011554
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-03T15:42:41-07:00
Commit Message:
CRUISE: Removed duplicate variable assignment
Changed paths:
engines/cruise/mainDraw.cpp
diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp
index 14b6daf..9a5df69 100644
--- a/engines/cruise/mainDraw.cpp
+++ b/engines/cruise/mainDraw.cpp
@@ -621,11 +621,9 @@ void buildSegment() {
unsigned char *drawPolyMode1(unsigned char *dataPointer, int linesToDraw) {
int index;
- int16 *pBufferDest;
+ int16 *pBufferDest = polyBuffer4 + nbseg * 2;
- pBufferDest = polyBuffer4 + nbseg * 2;
nbseg = linesToDraw;
- A2ptr = polyBuffer4;
index = *(dataPointer++);
polyXMin = polyXMax = pBufferDest[-2] = pBufferDest[-2 + linesToDraw * 2] = polyBuffer2[index * 2];
Commit: ec6a9d28727071c73e7de113d0530a71ef24b7d6
https://github.com/scummvm/scummvm/commit/ec6a9d28727071c73e7de113d0530a71ef24b7d6
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-03T15:42:42-07:00
Commit Message:
TSAGE: Removed duplicate assignments
Changed paths:
engines/tsage/blue_force/blueforce_scenes2.cpp
engines/tsage/blue_force/blueforce_scenes9.cpp
engines/tsage/core.cpp
diff --git a/engines/tsage/blue_force/blueforce_scenes2.cpp b/engines/tsage/blue_force/blueforce_scenes2.cpp
index 4b26d8d..008ab6a 100644
--- a/engines/tsage/blue_force/blueforce_scenes2.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes2.cpp
@@ -1152,7 +1152,6 @@ void Scene270::signal() {
_grandma.setStrip(8);
_grandma._frame = 5;
_field384 = 1;
- _field384 = 1;
BF_GLOBALS._player._moveDiff.x = 8;
BF_GLOBALS._player.enableControl();
diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index af32e6c..dbc46ea 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -668,7 +668,6 @@ void Scene900::signal() {
case 9016:
if ((BF_GLOBALS._clip1Bullets == 0) && (BF_GLOBALS._clip2Bullets == 0)){
BF_GLOBALS._clip1Bullets = 8;
- BF_GLOBALS._clip1Bullets = 8;
SceneItem::display2(900, 25);
} else if (BF_GLOBALS._clip1Bullets == 0) {
BF_GLOBALS._clip1Bullets = 8;
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index dbea7e8..5a43a3b 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1855,7 +1855,6 @@ SceneObject::SceneObject() : SceneHotspot() {
_moveDiff.x = 5;
_moveDiff.y = 3;
_numFrames = 10;
- _numFrames = 10;
_moveRate = 10;
_regionBitList = 0;
_sceneRegionId = 0;
More information about the Scummvm-git-logs
mailing list