diff options
| author | Max Horn | 2003-02-08 01:27:21 +0000 |
|---|---|---|
| committer | Max Horn | 2003-02-08 01:27:21 +0000 |
| commit | 24cba45574285fbc8a24436f2b9211d314a68783 (patch) | |
| tree | 9c8974f679486ac0158e2a847fcff48f0175a74f /scumm/scummvm.cpp | |
| parent | 5863805e2cc4fdb7da5903dbf58d1582d3a9f754 (diff) | |
| download | scummvm-rg350-24cba45574285fbc8a24436f2b9211d314a68783.tar.gz scummvm-rg350-24cba45574285fbc8a24436f2b9211d314a68783.tar.bz2 scummvm-rg350-24cba45574285fbc8a24436f2b9211d314a68783.zip | |
more access cleanup; also reorderd some method/function declarations in class Scumm
svn-id: r6593
Diffstat (limited to 'scumm/scummvm.cpp')
| -rw-r--r-- | scumm/scummvm.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index fbdb7b0e3e..2472dc70a1 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -1118,7 +1118,7 @@ void Scumm::shutDown(int i) void Scumm::processKbd() { int saveloadkey; - getKeyInput(0); + getKeyInput(); if (_features & GF_OLD256) /* FIXME: Support ingame screen */ saveloadkey = 319; @@ -1153,8 +1153,8 @@ void Scumm::processKbd() if (!_lastKeyHit) return; - if (keyScriptNo && (keyScriptKey == _lastKeyHit)) { - runScript(keyScriptNo, 0, 0, 0); + if (_keyScriptNo && (_keyScriptKey == _lastKeyHit)) { + runScript(_keyScriptNo, 0, 0, 0); return; } @@ -1228,13 +1228,12 @@ void Scumm::processKbd() _mouseButStat = _lastKeyHit; } -int Scumm::getKeyInput(int a) +int Scumm::getKeyInput() { _mouseButStat = 0; _lastKeyHit = checkKeyHit(); - if (a == 0) - convertKeysToClicks(); + convertKeysToClicks(); if (mouse.x < 0) mouse.x = 0; |