Ticket #7559: sky-hack3-updated.diff

File sky-hack3-updated.diff, 8.7 KB (added by eriktorbjorn, 17 years ago)

Updated version of sky-hack3.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,
     348        CLEARSCREEN,
    343349        SHOWSCREEN,     CD_20_LOG,
    344350        FADEUP,         CD_19_PAL,
    345351        WAITVOICE,
    … …  
    347353        LOOPBG,
    348354        PLAYVOICE,      CDV_21,         // Foster: "He was only a robot, but, well, I loved the little guy."
    349355        FADEDOWN,
    350         SHOWSCREEN,     CD_21_LOG,
     356        SHOWSCREEN | FULLSCREEN,        CD_21_LOG,
    351357        FADEUP,         CD_19_PAL,
    352358        WAITVOICE,
    353359        PLAYVOICE,      CDV_22,         // Foster: "Then, as suddenly as it started, the shooting stopped."
    … …  
    358364        /* fade down while Foster's saying his line */
    359365        FADEDOWN,
    360366        WAITVOICE,
    361         SHOWSCREEN,     CD_24_LOG,
     367        SHOWSCREEN | FULLSCREEN,        CD_24_LOG,
    362368        FADEUP,         CD_23_PAL,
    363369        PLAYVOICE,      CDV_24,         // Reich: "Whoever is in charge here, come forward..."
    364370        WAITVOICE,
    … …  
    367373        PLAYVOICE,      CDV_26,         // Foster: "Only a fool would have argued with that firepower."
    368374        WAITVOICE,
    369375        FADEDOWN,
     376        CLEARSCREEN,
     377        // This one could be fullscreen, but that causes animation glitches.
    370378        SHOWSCREEN,     CD_27_LOG,
    371379        FADEUP,         CD_27_PAL,
    372380        PLAYVOICE,      CDV_27,         // Shaman: "... I am the leader of these people... We are peaceful..."
    … …  
    389397        WAITVOICE,
    390398        PLAYVOICE,      CDV_36,         // Foster: "My mind racing, I remembered where I'd seen that symbol before..."
    391399                FADEDOWN,
     400                // This one could be fullscreen, but that causes animation glitches.
    392401                SHOWSCREEN,     CD_35_LOG,
    393402                FADEUP,         CD_35_PAL,
    394403        WAITVOICE,
    … …  
    401410        PLAYVOICE,      CDV_39,         // Foster: "The day my mother died."
    402411        WAITVOICE,
    403412        FADEDOWN,
    404         SHOWSCREEN,     CD_40_LOG,
     413        SHOWSCREEN | FULLSCREEN,        CD_40_LOG,
    405414        FADEUP,         CD_40_PAL,
    406415        PLAYVOICE,      CDV_40,         // Shaman: "You alright, city boy?"
    407416        WAITVOICE,
    … …  
    410419        PLAYVOICE,      CDV_42,         // Foster: "R-Robert."
    411420        WAITVOICE,
    412421        FADEDOWN,
     422        CLEARSCREEN,
    413423        SHOWSCREEN,     CD_43_LOG,
    414424        FADEUP,         CD_43_PAL,
    415425        PLAYVOICE,      CDV_43,         // Shaman: "Hah! Welcome to the Gap, Robert!"
    … …  
    424434        DOFLIRT,        CD_45,
    425435        WAITVOICE,
    426436        FADEDOWN,
    427         SHOWSCREEN,     CD_47_LOG,
     437        SHOWSCREEN | FULLSCREEN,        CD_47_LOG,
    428438        FADEUP,         CD_47_PAL,
    429439        PLAYVOICE,      CDV_47,         // Foster: "His tribe was poor, but they treated me like one of their own..."
    430440        WAITVOICE,
    431441        PLAYVOICE,      CDV_48,         // Foster: "I learned how to survive in the wasteland they called the Gap..."
    432442        FADEDOWN,
     443        CLEARSCREEN,
    433444        SHOWSCREEN,     CD_48_LOG,
    434445        FADEUP,         CD_48_PAL,
    435446        WAITVOICE,
    … …  
    503514        FADEDOWN,
    504515        PLAYVOICE,      CDV_71,         // Reich: "Good. Detonate."
    505516        WAITVOICE,
    506         SHOWSCREEN,     CD_72_LOG,
     517        SHOWSCREEN | FULLSCREEN,        CD_72_LOG,
    507518        FADEUP,         CD_72_PAL,
    508519        PLAYVOICE,      CDV_72,         // Foster: "Much too late."
    509520        WAITVOICE,
    510521        FADEDOWN,
     522        CLEARSCREEN,
    511523        SHOWSCREEN,     CD_73_LOG,
    512524        FADEUP,         CD_73_PAL,
    513525        PLAYVOICE,      CDV_73,         // Foster: "Why, you murdering..."
    … …  
    516528        WAITVOICE,
    517529        PLAYVOICE,      CDV_75,         // Foster: "All I could do was wait."
    518530        FADEDOWN,
    519         SHOWSCREEN,     CD_76_LOG,
     531        SHOWSCREEN | FULLSCREEN,        CD_76_LOG,
    520532        FADEUP,         CD_76_PAL,
    521533        WAITVOICE,
    522534        PLAYVOICE,      CDV_76,         // Foster: "Just like on a hunt. Just like the old man taught me."
    … …  
    524536        PLAYVOICE,      CDV_77,         // Foster: "Wait... and be ready."
    525537        WAITVOICE,
    526538        FADEDOWN,
     539        CLEARSCREEN,
    527540        SHOWSCREEN,     CD_78_LOG,
    528541        FADEUP,         CD_78_PAL,
    529542        PLAYVOICE,      CDV_78,         // Foster: "It was dawn when we reached the City."
    … …  
    551564        PLAYVOICE,      CDV_86,         // Foster: "Maybe I'd get some answers now."
    552565        DOFLIRT,        CD_102,
    553566        FADEDOWN,
     567        // This one could be fullscreen, but that causes animation glitches.
    554568        SHOWSCREEN,     CD_103_LOG,
    555569        FADEUP,         CD_103_PAL,
    556570        BGFLIRT,        CD_103,
    … …  
    560574        WAITVOICE,
    561575        STARTMUSIC,     2,
    562576        FADEDOWN,
    563         SHOWSCREEN,     CD_104_LOG,
     577        SHOWSCREEN | FULLSCREEN,        CD_104_LOG,
    564578        FADEUP,         CD_104_PAL,
    565579        DOFLIRT,        CD_104,
    566580        DOFLIRT,        CD_105,
    … …  
    568582};
    569583
    570584uint16 Intro::_floppyIntroSeq[] = {
     585        // This one could be fullscreen, but that causes animation glitches.
    571586        SHOWSCREEN,   60081,
    572587        FADEUP,       60080,
    573588        DOFLIRT,      60082,
    … …  
    602617                   4, IC_FX_VOLUME, 127,
    603618        COMMANDEND,
    604619        FADEDOWN,
     620        // This one could be fullscreen, but that causes animation glitches.
    605621        SHOWSCREEN,  60093,
    606622        FADEUP,       60092,
    607623        COMMANDFLIRT, 60094, // => command list 5
    … …  
    609625        COMMANDEND,
    610626        WAITMUSIC,
    611627        FADEDOWN,
    612         SHOWSCREEN,   60096,
     628        SHOWSCREEN | FULLSCREEN,   60096,
    613629        STARTMUSIC,       2,
    614630        FADEUP,       60095,
    615631        COMMANDFLIRT, 60097, // => command list 6a
    … …  
    691707        uint8 *vData = NULL;
    692708        // return false means cancel intro
    693709        uint16 command = *data++;
    694         switch (command) {
     710        switch (command & 0x7fff) {
    695711        case SHOWSCREEN:
    696                 _skyScreen->showScreen(*data++);
     712                _skyScreen->showScreen(*data++, (command & FULLSCREEN) ? true : false);
    697713                return true;
    698714        case FADEUP:
    699715                _skyScreen->paletteFadeUp(*data++);
    … …  
    773789        case STOPBG:
    774790                _mixer->stopID(SOUND_BG);
    775791                return true;
     792        case CLEARSCREEN:
     793                _skyScreen->clearScreen(true);
     794                return true;
    776795        default:
    777796                error("Unknown intro command %X", command);
    778797        }

  • 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