thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Fix verb/sentence handling in Indy3 mac (there, a double click must be used to trigger a verb/sentence)

Browse source 
svn-id: r42907
This commit is contained in:
Max Horn 2009-07-29 20:35:50 +00:00
parent e779747ca4
commit d91d68a9ca
4 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/scumm/script.cpp
View file

@ -23,10 +23,9 @@
* *
*/ */
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/util.h" #include "common/util.h"
#include "common/system.h"
#include "scumm/actor.h" #include "scumm/actor.h"
#include "scumm/object.h" #include "scumm/object.h"
@ -1195,6 +1194,12 @@ void ScummEngine::runInputScript(int clickArea, int val, int mode) {
args[1] = VAR(82 + (val - 100)); args[1] = VAR(82 + (val - 100));
} }
} }
// Clicks are handled differently in Indy3 mac: param 2 of the
// input script is set to 0 for normal clicks, and to 1 for double clicks.
uint32 time = _system->getMillis();
args[2] = (time < _lastInputScriptTime + 500); // 500 ms double click delay
_lastInputScriptTime = time;
} }
if (verbScript) if (verbScript)

1
engines/scumm/scumm.cpp
View file

@ -184,6 +184,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
_mouseAndKeyboardStat = 0; _mouseAndKeyboardStat = 0;
_leftBtnPressed = 0; _leftBtnPressed = 0;
_rightBtnPressed = 0; _rightBtnPressed = 0;
_lastInputScriptTime = 0;
_bootParam = 0; _bootParam = 0;
_dumpScripts = false; _dumpScripts = false;
_debugMode = 0; _debugMode = 0;

6
engines/scumm/scumm.h
View file

@ -615,6 +615,12 @@ protected:
uint16 _mouseAndKeyboardStat; uint16 _mouseAndKeyboardStat;
byte _leftBtnPressed, _rightBtnPressed; byte _leftBtnPressed, _rightBtnPressed;
/**
* Last time runInputScript was run (measured in terms of OSystem::getMillis()).
* This is currently only used for Indy3 mac to detect "double clicks".
*/
uint32 _lastInputScriptTime;
/** The bootparam, to be passed to the script 1, the bootscript. */ /** The bootparam, to be passed to the script 1, the bootscript. */
int _bootParam; int _bootParam;

9
engines/scumm/sound.cpp
View file

@ -23,6 +23,9 @@
* *
*/ */
#include "common/config-manager.h"
#include "common/timer.h"
#include "common/util.h"
#include "scumm/actor.h" #include "scumm/actor.h"
#include "scumm/file.h" #include "scumm/file.h"
@ -32,10 +35,6 @@
#include "scumm/sound.h" #include "scumm/sound.h"
#include "scumm/util.h" #include "scumm/util.h"
#include "common/config-manager.h"
#include "common/timer.h"
#include "common/util.h"
#include "sound/adpcm.h" #include "sound/adpcm.h"
#include "sound/audiocd.h" #include "sound/audiocd.h"
#include "sound/flac.h" #include "sound/flac.h"
@ -46,8 +45,6 @@
#include "sound/vorbis.h" #include "sound/vorbis.h"
#include "sound/wave.h" #include "sound/wave.h"
namespace Scumm { namespace Scumm {
struct MP3OffsetTable { /* Compressed Sound (.SO3) */ struct MP3OffsetTable { /* Compressed Sound (.SO3) */