[Scummvm-cvs-logs] scummvm master -> d3858c359fde79e443d6e61579b400a36dff13e3
bluegr
md5 at scummvm.org
Thu Nov 3 22:08:43 CET 2011
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:
ed257a351f LASTEXPRESS: Fixed typo in code logic
056c3992eb AGI: Commented out if statements that always evaluate to true
747bc75bc7 SCI: Fixed typo in colorIsFromMacClut()
b3134650df SCI: Fixed a workaround
86387f1d70 TUCKER: Added FIXMEs for seemingly superfluous logic branches
d3858c359f AGI: Commented out if statements that always evaluate to true
Commit: ed257a351fbe4ce332296811619893013ffcdf8a
https://github.com/scummvm/scummvm/commit/ed257a351fbe4ce332296811619893013ffcdf8a
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-03T13:33:34-07:00
Commit Message:
LASTEXPRESS: Fixed typo in code logic
Changed paths:
engines/lastexpress/entities/francois.cpp
diff --git a/engines/lastexpress/entities/francois.cpp b/engines/lastexpress/entities/francois.cpp
index 2b170d9..46cd790 100644
--- a/engines/lastexpress/entities/francois.cpp
+++ b/engines/lastexpress/entities/francois.cpp
@@ -450,7 +450,7 @@ label_callback:
if (isNight())
getAction()->playAnimation(getData()->entityPosition <= getEntityData(kEntityPlayer)->entityPosition ? kEventFrancoisWhistleNightD : kEventFrancoisWhistleNight);
else
- getAction()->playAnimation(getData()->entityPosition <= getEntityData(kEntityPlayer)->entityPosition ? kEventFrancoisWhistleD : kEventFrancoisWhistleD);
+ getAction()->playAnimation(getData()->entityPosition <= getEntityData(kEntityPlayer)->entityPosition ? kEventFrancoisWhistleD : kEventFrancoisWhistle);
}
getEntities()->loadSceneFromEntityPosition(getData()->car, (EntityPosition)(getData()->entityPosition + 750 * (getData()->direction == kDirectionUp ? -1 : 1)), getData()->direction == kDirectionUp);
break;
Commit: 056c3992eb4715c7efa6ac2fb857e21d79d7a450
https://github.com/scummvm/scummvm/commit/056c3992eb4715c7efa6ac2fb857e21d79d7a450
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-03T13:36:34-07:00
Commit Message:
AGI: Commented out if statements that always evaluate to true
Changed paths:
engines/agi/cycle.cpp
diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp
index 9cbab1f..99649fb 100644
--- a/engines/agi/cycle.cpp
+++ b/engines/agi/cycle.cpp
@@ -200,10 +200,11 @@ int AgiEngine::mainCycle() {
// vars in every interpreter cycle.
//
// We run AGIMOUSE always as a side effect
- if (getFeatures() & GF_AGIMOUSE || true) {
+ //if (getFeatures() & GF_AGIMOUSE) {
_game.vars[28] = _mouse.x / 2;
_game.vars[29] = _mouse.y;
- }
+ //}
+
if (key == KEY_PRIORITY) {
_sprites->eraseBoth();
_debug.priority = !_debug.priority;
@@ -315,7 +316,7 @@ int AgiEngine::playGame() {
_game.lineUserInput = 22;
// We run AGIMOUSE always as a side effect
- if (getFeatures() & GF_AGIMOUSE || true)
+ //if (getFeatures() & GF_AGIMOUSE)
debug(1, "Using AGI Mouse 1.0 protocol");
if (getFeatures() & GF_AGIPAL)
Commit: 747bc75bc724f6055c4140403eb60613777e245e
https://github.com/scummvm/scummvm/commit/747bc75bc724f6055c4140403eb60613777e245e
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-03T13:40:28-07:00
Commit Message:
SCI: Fixed typo in colorIsFromMacClut()
Changed paths:
engines/sci/graphics/palette.cpp
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index b52af38..a7a5dc9 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -966,7 +966,7 @@ void GfxPalette::loadMacIconBarPalette() {
}
bool GfxPalette::colorIsFromMacClut(byte index) {
- return index != 0 && _macClut && (_macClut[index * 3] != 0 || _macClut[index * 3 + 1] != 0 || _macClut[index * 3 + 1] != 0);
+ return index != 0 && _macClut && (_macClut[index * 3] != 0 || _macClut[index * 3 + 1] != 0 || _macClut[index * 3 + 2] != 0);
}
#ifdef ENABLE_SCI32
Commit: b3134650df4e969ade9c92dfc2a5c57f4718959e
https://github.com/scummvm/scummvm/commit/b3134650df4e969ade9c92dfc2a5c57f4718959e
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-03T13:44:11-07:00
Commit Message:
SCI: Fixed a workaround
Changed paths:
engines/sci/engine/segment.cpp
diff --git a/engines/sci/engine/segment.cpp b/engines/sci/engine/segment.cpp
index 8bf6e83..73d81ba 100644
--- a/engines/sci/engine/segment.cpp
+++ b/engines/sci/engine/segment.cpp
@@ -143,10 +143,11 @@ SegmentRef LocalVariables::dereference(reg_t pointer) {
if (ret.maxSize > 0) {
ret.reg = &_locals[pointer.offset / 2];
} else {
- // FIXME: Second 660 has to be either fixed or removed
- if ((g_sci->getEngineState()->currentRoomNumber() == 660 || g_sci->getEngineState()->currentRoomNumber() == 660)
+ if ((g_sci->getEngineState()->currentRoomNumber() == 160 ||
+ g_sci->getEngineState()->currentRoomNumber() == 220)
&& g_sci->getGameId() == GID_LAURABOW2) {
- // Happens in two places during the intro of LB2CD, both from kMemory(peek):
+ // WORKAROUND: Happens in two places during the intro of LB2CD, both
+ // from kMemory(peek):
// - room 160: Heap 160 has 83 local variables (0-82), and the game
// asks for variables at indices 83 - 90 too.
// - room 220: Heap 220 has 114 local variables (0-113), and the
Commit: 86387f1d70038be89d9e7f7870fbf3862dfed7ab
https://github.com/scummvm/scummvm/commit/86387f1d70038be89d9e7f7870fbf3862dfed7ab
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-03T13:53:32-07:00
Commit Message:
TUCKER: Added FIXMEs for seemingly superfluous logic branches
Changed paths:
engines/tucker/locations.cpp
diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index 70b17e4..49340e9 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -2185,6 +2185,7 @@ void TuckerEngine::updateSprite_locationNum48(int i) {
_spritesTable[i].needUpdate = 1;
state = 2;
} else if (getRandomNumber() < 30000) {
+ // FIXME: This case is similar to the case below.
_spritesTable[i].needUpdate = 0;
state = 2;
_spritesTable[i].updateDelay = 5;
@@ -2858,6 +2859,7 @@ void TuckerEngine::updateSprite_locationNum66_1(int i) {
_spritesTable[i].needUpdate = 1;
state = 8;
} else if (getRandomNumber() > 30000) {
+ // FIXME: This case is the same as the one below
state = 10;
_spritesTable[i].needUpdate = 0;
} else {
Commit: d3858c359fde79e443d6e61579b400a36dff13e3
https://github.com/scummvm/scummvm/commit/d3858c359fde79e443d6e61579b400a36dff13e3
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-03T13:55:22-07:00
Commit Message:
AGI: Commented out if statements that always evaluate to true
Changed paths:
engines/agi/op_cmd.cpp
diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index 72f60e2..41d9cc3 100644
--- a/engines/agi/op_cmd.cpp
+++ b/engines/agi/op_cmd.cpp
@@ -1622,15 +1622,15 @@ void cmdPrintAtV(AgiGame *state, uint8 *p) {
void cmdPushScript(AgiGame *state, uint8 *p) {
// We run AGIMOUSE always as a side effect
- if (getFeatures() & GF_AGIMOUSE || true) {
+ //if (getFeatures() & GF_AGIMOUSE || true) {
state->vars[27] = state->_vm->_mouse.button;
state->vars[28] = state->_vm->_mouse.x / 2;
state->vars[29] = state->_vm->_mouse.y;
- } else {
+ /*} else {
if (getVersion() >= 0x2915) {
debug(0, "push.script");
}
- }
+ }*/
}
void cmdSetPriBase(AgiGame *state, uint8 *p) {
More information about the Scummvm-git-logs
mailing list