aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTravis Howell2006-04-04 11:06:48 +0000
committerTravis Howell2006-04-04 11:06:48 +0000
commitcc75c6809079e942e55f6f21ed976a6a1b67e031 (patch)
tree54e630625adcc16a7f947e895dd4ecd43c3d28b2 /engines
parent49dc2622dd64924fe4d6fa76831e05db48017285 (diff)
downloadscummvm-rg350-cc75c6809079e942e55f6f21ed976a6a1b67e031.tar.gz
scummvm-rg350-cc75c6809079e942e55f6f21ed976a6a1b67e031.tar.bz2
scummvm-rg350-cc75c6809079e942e55f6f21ed976a6a1b67e031.zip
Add skipSpeech difference in FF
svn-id: r21590
Diffstat (limited to 'engines')
-rw-r--r--engines/simon/cursor.cpp2
-rw-r--r--engines/simon/simon.cpp32
-rw-r--r--engines/simon/simon.h2
3 files changed, 22 insertions, 14 deletions
diff --git a/engines/simon/cursor.cpp b/engines/simon/cursor.cpp
index 248039d05d..2d54f3080b 100644
--- a/engines/simon/cursor.cpp
+++ b/engines/simon/cursor.cpp
@@ -224,6 +224,8 @@ static const byte _simon2_cursors[10][256] = {
};
void SimonEngine::drawMousePointer() {
+ debug(0, "Mouse %d Anim %d Max %d", _mouseCursor, _mouseAnim, _mouseAnimMax);
+
if (getGameType() == GType_SIMON2)
_system->setMouseCursor(_simon2_cursors[_mouseCursor], 16, 16, 7, 7);
else
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index 9bd3e4b1ea..9712ec89f3 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -332,7 +332,6 @@ SimonEngine::SimonEngine(OSystem *syst)
_fastFadeOutFlag = 0;
_unkPalFlag = 0;
_exitCutscene = 0;
- _rightClick = 0;
_paletteFlag = 0;
_soundFileId = 0;
@@ -1604,7 +1603,7 @@ void SimonEngine::setup_cond_c_helper() {
_leftButtonDown = 0;
do {
- if (_exitCutscene && (_bitArray[0] & 0x200)) {
+ if (_exitCutscene && getBitFlag(9)) {
endCutscene();
goto out_of_here;
}
@@ -1726,8 +1725,8 @@ void SimonEngine::handle_mouse_moved() {
}
}
- if (_rightClick) {
- _rightClick = false;
+ if (_rightButtonDown) {
+ _rightButtonDown = false;
setVerb(NULL);
}
}
@@ -2714,9 +2713,9 @@ void SimonEngine::o_waitForSync(uint a) {
_vgaWaitFor = a;
_syncCount = 0;
_exitCutscene = false;
- _rightClick = false;
+ _rightButtonDown = false;
while (_vgaWaitFor != 0) {
- if (_rightClick && (getGameType() == GType_SIMON2 || getGameType() == GType_FF)) {
+ if (_rightButtonDown && (getGameType() == GType_SIMON2 || getGameType() == GType_FF)) {
if (_vgaWaitFor == 200 && !getBitFlag(14)) {
skipSpeech();
break;
@@ -2747,12 +2746,19 @@ void SimonEngine::o_waitForSync(uint a) {
void SimonEngine::skipSpeech() {
_sound->stopVoice();
- if (!(_bitArray[1] & 0x1000)) {
- _bitArray[0] |= 0x4000;
- _variableArray[100] = 5;
- loadSprite(4, 1, 30, 0, 0, 0);
- o_waitForSync(130);
- o_kill_sprite_simon2(2, 1);
+ if (getBitFlag(28) == false) {
+ setBitFlag(14, true);
+ if (getGameType() == GType_FF) {
+ _variableArray[103] = 5;
+ loadSprite(4, 2, 13, 0, 0, 0);
+ o_waitForSync(213);
+ o_kill_sprite_simon2(2, 1);
+ } else {
+ _variableArray[100] = 5;
+ loadSprite(4, 1, 30, 0, 0, 0);
+ o_waitForSync(130);
+ o_kill_sprite_simon2(2, 1);
+ }
}
}
@@ -4217,7 +4223,7 @@ void SimonEngine::delay(uint amount) {
if (getGameType() == GType_FF)
_bitArray[5] &= ~0x1000;
if (getGameType() == GType_SIMON2 || getGameType() == GType_FF)
- _rightClick = true;
+ _rightButtonDown++;
else
_exitCutscene = true;
break;
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index 860f9a61ce..f12a866ad4 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -283,6 +283,7 @@ protected:
HitArea *_lastHitArea2Ptr;
HitArea *_lastHitArea3;
byte _leftButtonDown;
+ byte _rightButtonDown;
Item *_hitAreaSubjectItem;
HitArea *_currentVerbBox, *_hitAreaPtr7;
uint _needHitAreaRecalc;
@@ -323,7 +324,6 @@ protected:
bool _fastFadeOutFlag;
bool _unkPalFlag;
bool _exitCutscene;
- bool _rightClick;
bool _noRightClick;
byte _paletteFlag;