Ticket #8461: iq-hack-updated.diff

File iq-hack-updated.diff, 3.2 KB (added by eriktorbjorn, 17 years ago)

Updated patch against current SVN

  • engines/scumm/input.cpp

     
    313313
    314314#ifndef DISABLE_SCUMM_7_8
    315315void ScummEngine_v8::processKeyboard(int lastKeyHit) {
     316        // Alt-F5 brings up the original save/load dialog
     317
     318        if (lastKeyHit == 440 && !(_game.features & GF_DEMO)) {
     319                lastKeyHit = 315;
     320        }
     321
    316322        // If a key script was specified (a V8 feature), and it's trigger
    317323        // key was pressed, run it.
    318324        if (_keyScriptNo && (_keyScriptKey == lastKeyHit)) {
     
    435441                        // Fall back to default behavior
    436442                        ScummEngine::processKeyboard(lastKeyHit);
    437443                }
     444
     445                // Alt-F5 brings up the original save/load dialog
     446
     447                if (lastKeyHit == 440) {
     448                        lastKeyHit = 314+5;
     449                }
    438450       
    439451                // Store the input type. So far we can't distinguish
    440452                // between 1, 3 and 5.
     
    469481        else
    470482                saveloadkey = VAR(VAR_MAINMENU_KEY);
    471483
     484        // Alt-F5 brings up the original save/load dialog.
     485
     486        if (lastKeyHit == 440 && _game.version > 2 && _game.version < 8) {
     487                lastKeyHit = saveloadkey;
     488                saveloadkey = -1;
     489        }
     490
    472491        if (lastKeyHit == saveloadkey) {
    473492                if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0)
    474493                        runScript(VAR(VAR_SAVELOAD_SCRIPT), 0, 0, 0);
  • README

     
    810810        [ and ]                - Music volume, down/up
    811811        - and +                - Text speed, slower/faster
    812812        F5                     - Displays a save/load box
     813        Alt-F5                 - Displays the original save/load box, if the
     814                                 game has one. This is not intended for saving
     815                                 or loading a game, and may even crash ScummVM
     816                                 in some games, but it is currently the only
     817                                 way to see your IQ points in Indiana Jones and
     818                                 the Last Crusade without dying.
    813819        Space                  - Pauses
    814820        Period (.)             - Skips current line of text in some games
    815821        Enter                  - Simulate left mouse button press
  • doc/running-hotkeys.tex

     
    3434    $[$ and $]$                & Music volume, down/up\\
    3535    - and +                & Text speed, slower/faster\\
    3636    F5                     & Displays a save/load box\\
     37    Alt-F5                 & Displays the original save/load box, if the game\\
     38                           & has one. This is not intended for saving or\\
     39                           & loading a game, and may even crash ScummVM in\\
     40                           & some games, but it is currently the only way to\\
     41                           & see your IQ points in Indiana Jones and the Last\\
     42                           & Crusade without dying.\\
    3743    Space                  & Pauses\\
    3844    Period (.)             & Skips current line of text in some games\\
    3945    Enter                  & Simulate left mouse button press\\