Ticket #7559: sky-hack3b-updated.diff

File sky-hack3b-updated.diff, 9.7 KB (added by jvprat, 17 years ago)

Updated version of sky-hack3b.diff

  • engines/sky/screen.h

     
    6464        void paletteFadeUp(uint8 *pal);
    6565        void paletteFadeUp(uint16 fileNr);
    6666
    67         void showScreen(uint16 fileNum);
    68         void showScreen(uint8 *pScreen);
     67        void showScreen(uint16 fileNum, bool fullscreen = false);
     68        void showScreen(uint8 *pScreen, bool fullscreen = false);
    6969
    7070        void handleTimer(void);
    7171        void startSequence(uint16 fileNum);
    … …  
    8282        void fnFadeUp(uint32 palNum, uint32 scroll);
    8383        void fnFadeDown(uint32 scroll);
    8484        void fnDrawScreen(uint32 palette, uint32 scroll);
    85         void clearScreen(void);
     85        void clearScreen(bool fullscreen = false);
    8686        void setFocusRectangle(const Common::Rect& rect);
    8787
    8888        void recreate(void);

  • engines/sky/intro.cpp

     
    6363#define PLAYBG                  15 // play background sound
    6464#define LOOPBG                  16 // loop background sound
    6565#define STOPBG                  17 // stop background sound
     66#define CLEARSCREEN             18 // clear the screen
    6667#define SEQEND           65535 // end of intro sequence
    6768
     69// Modifier flag for SHOWSCREEN when we want the image to cover the entire
     70// screen.
     71#define FULLSCREEN              0x8000
     72
    6873#define IC_PREPARE_TEXT 20 // commands used in COMMANDFLIRT block
    6974#define IC_SHOW_TEXT    21
    7075#define IC_REMOVE_TEXT  22
    … …  
    334339        WAITFLIRT,
    335340        WAITVOICE,
    336341        FADEDOWN,
    337         SHOWSCREEN,     CD_19_LOG,
     342        SHOWSCREEN | FULLSCREEN,        CD_19_LOG,
    338343        FADEUP,         CD_19_PAL,
    339344        PLAYVOICE,      CDV_19,         // Joey: "Foster! (zzzt) H-Help!"
    340345        WAITVOICE,
    341346        PLAYVOICE,      CDV_20,         // Joey: "Better make my next body move faster, Foster..."
    342347        FADEDOWN,
    343         SHOWSCREEN,     CD_20_LOG,
     348        SHOWSCREEN | FULLSCREEN,        CD_20_LOG,
    344349        FADEUP,         CD_19_PAL,
    345350        WAITVOICE,
    346351        LOADBG,         59496, // quiet heli
    347352        LOOPBG,
    348353        PLAYVOICE,      CDV_21,         // Foster: "He was only a robot, but, well, I loved the little guy."
    349354        FADEDOWN,
    350         SHOWSCREEN,     CD_21_LOG,
     355        SHOWSCREEN | FULLSCREEN,        CD_21_LOG,
    351356        FADEUP,         CD_19_PAL,
    352357        WAITVOICE,
    353358        PLAYVOICE,      CDV_22,         // Foster: "Then, as suddenly as it started, the shooting stopped."
    … …  
    358363        /* fade down while Foster's saying his line */
    359364        FADEDOWN,
    360365        WAITVOICE,
    361         SHOWSCREEN,     CD_24_LOG,
     366        SHOWSCREEN | FULLSCREEN,        CD_24_LOG,
    362367        FADEUP,         CD_23_PAL,
    363368        PLAYVOICE,      CDV_24,         // Reich: "Whoever is in charge here, come forward..."
    364369        WAITVOICE,
    … …  
    367372        PLAYVOICE,      CDV_26,         // Foster: "Only a fool would have argued with that firepower."
    368373        WAITVOICE,
    369374        FADEDOWN,
     375        CLEARSCREEN,
     376        // This one could be fullscreen, but that causes animation glitches.
    370377        SHOWSCREEN,     CD_27_LOG,
    371378        FADEUP,         CD_27_PAL,
    372379        PLAYVOICE,      CDV_27,         // Shaman: "... I am the leader of these people... We are peaceful..."
    … …  
    389396        WAITVOICE,
    390397        PLAYVOICE,      CDV_36,         // Foster: "My mind racing, I remembered where I'd seen that symbol before..."
    391398                FADEDOWN,
     399                // This one could be fullscreen, but that causes animation glitches.
    392400                SHOWSCREEN,     CD_35_LOG,
    393401                FADEUP,         CD_35_PAL,
    394402        WAITVOICE,
    … …  
    401409        PLAYVOICE,      CDV_39,         // Foster: "The day my mother died."
    402410        WAITVOICE,
    403411        FADEDOWN,
    404         SHOWSCREEN,     CD_40_LOG,
     412        SHOWSCREEN | FULLSCREEN,        CD_40_LOG,
    405413        FADEUP,         CD_40_PAL,
    406414        PLAYVOICE,      CDV_40,         // Shaman: "You alright, city boy?"
    407415        WAITVOICE,
    … …  
    410418        PLAYVOICE,      CDV_42,         // Foster: "R-Robert."
    411419        WAITVOICE,
    412420        FADEDOWN,
    413         SHOWSCREEN,     CD_43_LOG,
     421        SHOWSCREEN | FULLSCREEN,        CD_43_LOG,
    414422        FADEUP,         CD_43_PAL,
    415423        PLAYVOICE,      CDV_43,         // Shaman: "Hah! Welcome to the Gap, Robert!"
    416424        WAITVOICE,
    … …  
    424432        DOFLIRT,        CD_45,
    425433        WAITVOICE,
    426434        FADEDOWN,
    427         SHOWSCREEN,     CD_47_LOG,
     435        SHOWSCREEN | FULLSCREEN,        CD_47_LOG,
    428436        FADEUP,         CD_47_PAL,
    429437        PLAYVOICE,      CDV_47,         // Foster: "His tribe was poor, but they treated me like one of their own..."
    430438        WAITVOICE,
    431439        PLAYVOICE,      CDV_48,         // Foster: "I learned how to survive in the wasteland they called the Gap..."
    432440        FADEDOWN,
    433         SHOWSCREEN,     CD_48_LOG,
     441        SHOWSCREEN | FULLSCREEN,        CD_48_LOG,
    434442        FADEUP,         CD_48_PAL,
    435443        WAITVOICE,
    436444        BGFLIRT,        CD_48,
    … …  
    503511        FADEDOWN,
    504512        PLAYVOICE,      CDV_71,         // Reich: "Good. Detonate."
    505513        WAITVOICE,
    506         SHOWSCREEN,     CD_72_LOG,
     514        SHOWSCREEN | FULLSCREEN,        CD_72_LOG,
    507515        FADEUP,         CD_72_PAL,
    508516        PLAYVOICE,      CDV_72,         // Foster: "Much too late."
    509517        WAITVOICE,
    510518        FADEDOWN,
    511         SHOWSCREEN,     CD_73_LOG,
     519        SHOWSCREEN | FULLSCREEN,        CD_73_LOG,
    512520        FADEUP,         CD_73_PAL,
    513521        PLAYVOICE,      CDV_73,         // Foster: "Why, you murdering..."
    514522        WAITVOICE,
    … …  
    516524        WAITVOICE,
    517525        PLAYVOICE,      CDV_75,         // Foster: "All I could do was wait."
    518526        FADEDOWN,
    519         SHOWSCREEN,     CD_76_LOG,
     527        SHOWSCREEN | FULLSCREEN,        CD_76_LOG,
    520528        FADEUP,         CD_76_PAL,
    521529        WAITVOICE,
    522530        PLAYVOICE,      CDV_76,         // Foster: "Just like on a hunt. Just like the old man taught me."
    … …  
    524532        PLAYVOICE,      CDV_77,         // Foster: "Wait... and be ready."
    525533        WAITVOICE,
    526534        FADEDOWN,
     535        CLEARSCREEN,
    527536        SHOWSCREEN,     CD_78_LOG,
    528537        FADEUP,         CD_78_PAL,
    529538        PLAYVOICE,      CDV_78,         // Foster: "It was dawn when we reached the City."
    … …  
    538547                PLAYVOICE,      CDV_82, // Guard: "Yes, sir. Locking on automatic landing beacon."
    539548                WAITVOICE,
    540549        WAITFLIRT,
    541         SHOWSCREEN,     CD_101_LOG,
     550        SHOWSCREEN | FULLSCREEN,        CD_101_LOG,
    542551        BGFLIRT,        CD_101,
    543552                PLAYVOICE,      CDV_83, // Foster: "But what was I? Why did..."
    544553                WAITVOICE,
    … …  
    547556                PLAYVOICE,      CDV_85, // Guard: "We're going to HIT!"
    548557                WAITVOICE,
    549558        WAITFLIRT,
     559        CLEARSCREEN,
    550560        SHOWSCREEN,     CD_102_LOG,
    551561        PLAYVOICE,      CDV_86,         // Foster: "Maybe I'd get some answers now."
    552562        DOFLIRT,        CD_102,
    553563        FADEDOWN,
     564        // This one could be fullscreen, but that causes animation glitches.
    554565        SHOWSCREEN,     CD_103_LOG,
    555566        FADEUP,         CD_103_PAL,
    556567        BGFLIRT,        CD_103,
    … …  
    560571        WAITVOICE,
    561572        STARTMUSIC,     2,
    562573        FADEDOWN,
    563         SHOWSCREEN,     CD_104_LOG,
     574        SHOWSCREEN | FULLSCREEN,        CD_104_LOG,
    564575        FADEUP,         CD_104_PAL,
    565576        DOFLIRT,        CD_104,
    566577        DOFLIRT,        CD_105,
    … …  
    568579};
    569580
    570581uint16 Intro::_floppyIntroSeq[] = {
     582        // This one could be fullscreen, but that causes animation glitches.
    571583        SHOWSCREEN,   60081,
    572584        FADEUP,       60080,
    573585        DOFLIRT,      60082,
    … …  
    582594                 50, IC_FX_VOLUME,  90,
    583595                  5, IC_FX_VOLUME, 100,
    584596        COMMANDEND,
    585         SHOWSCREEN,   60088,
     597        SHOWSCREEN | FULLSCREEN,   60088,
    586598        COMMANDFLIRT, 60089, // => command list 4b (cockpit)
    587599                1000, IC_PREPARE_TEXT,  77,
    588600                 220, IC_SHOW_TEXT,     20, 160, // radar detects jamming signal
    … …  
    594606                  35, IC_SHOW_TEXT,     30, 160,
    595607                   3, IC_REMOVE_TEXT,
    596608        COMMANDEND,
     609        CLEARSCREEN,
    597610        SHOWSCREEN,   60090,
    598611        COMMANDFLIRT, 60091, // => command list 4c
    599612                1000, IC_FX_VOLUME, 100,
    … …  
    602615                   4, IC_FX_VOLUME, 127,
    603616        COMMANDEND,
    604617        FADEDOWN,
     618        // This one could be fullscreen, but that causes animation glitches.
    605619        SHOWSCREEN,  60093,
    606620        FADEUP,       60092,
    607621        COMMANDFLIRT, 60094, // => command list 5
    … …  
    609623        COMMANDEND,
    610624        WAITMUSIC,
    611625        FADEDOWN,
    612         SHOWSCREEN,   60096,
     626        SHOWSCREEN | FULLSCREEN,   60096,
    613627        STARTMUSIC,       2,
    614628        FADEUP,       60095,
    615629        COMMANDFLIRT, 60097, // => command list 6a
    … …  
    691705        uint8 *vData = NULL;
    692706        // return false means cancel intro
    693707        uint16 command = *data++;
    694         switch (command) {
     708        switch (command & 0x7fff) {
    695709        case SHOWSCREEN:
    696                 _skyScreen->showScreen(*data++);
     710                _skyScreen->showScreen(*data++, (command & FULLSCREEN) ? true : false);
    697711                return true;
    698712        case FADEUP:
    699713                _skyScreen->paletteFadeUp(*data++);
    … …  
    773787        case STOPBG:
    774788                _mixer->stopID(SOUND_BG);
    775789                return true;
     790        case CLEARSCREEN:
     791                _skyScreen->clearScreen(true);
     792                return true;
    776793        default:
    777794                error("Unknown intro command %X", command);
    778795        }

  • engines/sky/sky.cpp

     
    281281                }
    282282
    283283                if (!_systemVars.quitGame) {
     284                        _skyScreen->clearScreen(true);
    284285                        _skyLogic->initScreen0();
    285286                        if (introSkipped)
    286287                                _skyControl->restartGame();

  • engines/sky/screen.cpp

     
    9999                free(_scrollScreen);
    100100}
    101101
    102 void Screen::clearScreen(void) {
     102void Screen::clearScreen(bool fullscreen) {
    103103
    104104        memset(_currentScreen, 0, FULL_SCREEN_WIDTH * FULL_SCREEN_HEIGHT);
    105         _system->copyRectToScreen(_currentScreen, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
     105        _system->copyRectToScreen(_currentScreen, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, fullscreen ? FULL_SCREEN_HEIGHT : GAME_SCREEN_HEIGHT);
    106106        _system->updateScreen();
    107107}
    108108
    … …  
    154154                warning("Screen::setPalette: can't load file nr. %d",fileNum);
    155155}
    156156
    157 void Screen::showScreen(uint16 fileNum) {
     157void Screen::showScreen(uint16 fileNum, bool fullscreen) {
    158158        // This is only used for static images in the floppy and cd intro
    159159        if (_currentScreen)
    160160                free(_currentScreen);
    161161        _currentScreen = _skyDisk->loadFile(fileNum);
    162         // make sure the last 8 lines are forced to black.
    163         memset(_currentScreen + GAME_SCREEN_HEIGHT * GAME_SCREEN_WIDTH, 0, (FULL_SCREEN_HEIGHT - GAME_SCREEN_HEIGHT) * GAME_SCREEN_WIDTH);
     162        if (!fullscreen) {
     163                // make sure the last 8 lines are forced to black.
     164                memset(_currentScreen + GAME_SCREEN_HEIGHT * GAME_SCREEN_WIDTH, 0, (FULL_SCREEN_HEIGHT - GAME_SCREEN_HEIGHT) * GAME_SCREEN_WIDTH);
     165        }
    164166
    165167        if (_currentScreen)
    166                 showScreen(_currentScreen);
     168                showScreen(_currentScreen, fullscreen);
    167169        else
    168170                warning("Screen::showScreen: can't load file nr. %d",fileNum);
    169171}
    170172
    171 void Screen::showScreen(uint8 *pScreen) {
     173void Screen::showScreen(uint8 *pScreen, bool fullscreen) {
    172174
    173         _system->copyRectToScreen(pScreen, 320, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
     175        _system->copyRectToScreen(pScreen, 320, 0, 0, GAME_SCREEN_WIDTH, fullscreen ? FULL_SCREEN_HEIGHT : GAME_SCREEN_HEIGHT);
    174176        _system->updateScreen();
    175177}
    176178