ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

support F-keys in V2 games

Browse Source 
svn-id: r8576
This commit is contained in:
Max Horn
2003-06-21 01:45:38 +00:00
parent 5477d0831b
commit b81cbb930f
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scumm/scummvm.cpp
+18 -12
View File
@@ -1809,6 +1809,10 @@ void Scumm::clearClickedStatus() {
int Scumm::checkKeyHit() {
int a = _keyPressed;
_keyPressed = 0;
if (_version <= 2 && 315 <= a && a < 315+12) {
// Convert F-Keys
a -= 314;
}
return a;
}
@@ -1921,8 +1925,10 @@ void Scumm::processKbd() {
int saveloadkey;
getKeyInput();
if ((_features & GF_OLD256) || (_gameId == GID_CMI) || (_features & GF_OLD_BUNDLE)) /* FIXME: Support ingame screen */
saveloadkey = 319;
if (_version <= 2)
saveloadkey = 5; // F5
else if ((_features & GF_OLD256) || (_gameId == GID_CMI)) /* FIXME: Support ingame screen ? */
saveloadkey = 319; // F5
else
saveloadkey = VAR(VAR_SAVELOADDIALOG_KEY);
@@ -2015,6 +2021,16 @@ void Scumm::processKbd() {
VAR(VAR_CHARINC) = _defaultTalkDelay / 20;
} else if (_lastKeyHit == '~' || _lastKeyHit == '#') { // Debug console
g_debugger->attach(this, NULL);
} else if (_version <= 2) {
// Store the input type. So far we can't distinguish
// between 1, 3 and 5.
// 1) Verb 2) Scene 3) Inv. 4) Key
// 5) Sentence Bar
if (_lastKeyHit) { // Key Input
VAR(VAR_KEYPRESS) = _lastKeyHit;
runInputScript(4, 0, 0);
}
}
_mouseButStat = _lastKeyHit;
@@ -2065,16 +2081,6 @@ int Scumm::getKeyInput() {
} else if (_version == 7) {
VAR(VAR_LEFTBTN_HOLD) = (_leftBtnPressed & msDown) != 0;
VAR(VAR_RIGHTBTN_HOLD) = (_rightBtnPressed & msDown) != 0;
} else if (_version <= 2) {
// Store the input type. So far we can't distinguish
// between 1, 3 and 5.
// 1) Verb 2) Scene 3) Inv. 4) Key
// 5) Sentence Bar
if (_lastKeyHit) { // Key Input
VAR(VAR_KEYPRESS) = _lastKeyHit;
runInputScript(4, 0, 0);
}
}
_leftBtnPressed &= ~msClicked;