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

more access cleanup; also reorderd some method/function declarations in class Scumm

Browse source 
svn-id: r6593
This commit is contained in:
Max Horn 2003-02-08 01:27:21 +00:00
parent 5863805e2c
commit 24cba45574
5 changed files with 70 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scumm/scummvm.cpp
View file

@ -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;