diff options
author | Strangerke | 2013-01-03 22:32:22 +0100 |
---|---|---|
committer | Strangerke | 2013-01-03 22:32:22 +0100 |
commit | 6976be7438ef842e08c8b4587c7e323d4af21109 (patch) | |
tree | b0a32a9c1b8ef9677dc003cbfdd367e218973ef0 /engines | |
parent | 079994d35c2d366a255c66a8cddd55a6cb5b7150 (diff) | |
download | scummvm-rg350-6976be7438ef842e08c8b4587c7e323d4af21109.tar.gz scummvm-rg350-6976be7438ef842e08c8b4587c7e323d4af21109.tar.bz2 scummvm-rg350-6976be7438ef842e08c8b4587c7e323d4af21109.zip |
HOPKINS: Rename functions related to fade in/out. Fix a potential issue for short fadings
Diffstat (limited to 'engines')
-rw-r--r-- | engines/hopkins/anim.cpp | 18 | ||||
-rw-r--r-- | engines/hopkins/computer.cpp | 4 | ||||
-rw-r--r-- | engines/hopkins/graphics.cpp | 97 | ||||
-rw-r--r-- | engines/hopkins/graphics.h | 14 | ||||
-rw-r--r-- | engines/hopkins/hopkins.cpp | 154 | ||||
-rw-r--r-- | engines/hopkins/menu.cpp | 4 | ||||
-rw-r--r-- | engines/hopkins/objects.cpp | 16 | ||||
-rw-r--r-- | engines/hopkins/script.cpp | 32 |
8 files changed, 172 insertions, 167 deletions
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp index 38852f38dd..bce08a3773 100644 --- a/engines/hopkins/anim.cpp +++ b/engines/hopkins/anim.cpp @@ -197,12 +197,12 @@ EXIT: _vm->_graphicsManager.Copy_WinScan_Vbe3(screenP, screenCopy); } } while (breakFlag); - _vm->_graphicsManager.FADE_OUTW_LINUX(screenCopy); + _vm->_graphicsManager.fadeOutDefaultLength(screenCopy); screenCopy = _vm->_globals.freeMemory(screenCopy); } if (hasScreenCopy) { if (_vm->_graphicsManager.FADE_LINUX == 2) - _vm->_graphicsManager.FADE_OUTW_LINUX(screenCopy); + _vm->_graphicsManager.fadeOutDefaultLength(screenCopy); screenCopy = _vm->_globals.freeMemory(screenCopy); } @@ -333,7 +333,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 a2, uint } _vm->_graphicsManager.unlockScreen(); _vm->_eventsManager.VBL(); - _vm->_graphicsManager.FADE_INS(); + _vm->_graphicsManager.fadeInShort(); } LABEL_48: _vm->_eventsManager._rateCounter = 0; @@ -428,12 +428,12 @@ LABEL_114: _vm->_graphicsManager.Copy_WinScan_Vbe3(v12, ptra); } } while (v6 != -1); - _vm->_graphicsManager.FADE_OUTW_LINUX(ptra); + _vm->_graphicsManager.fadeOutDefaultLength(ptra); ptra = _vm->_globals.freeMemory(ptra); } if (v8 == 1) { if (_vm->_graphicsManager.FADE_LINUX == 2) - _vm->_graphicsManager.FADE_OUTW_LINUX(ptr); + _vm->_graphicsManager.fadeOutDefaultLength(ptr); _vm->_globals.freeMemory(ptr); } _vm->_graphicsManager.FADE_LINUX = 0; @@ -462,7 +462,7 @@ LABEL_114: _vm->_graphicsManager.m_scroll16(_vm->_graphicsManager._vesaBuffer, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); } _vm->_graphicsManager.unlockScreen(); - _vm->_graphicsManager.FADE_INS(); + _vm->_graphicsManager.fadeInShort(); _vm->_graphicsManager.DD_VBL(); } @@ -791,7 +791,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui } } else { if (NO_COUL) - _vm->_graphicsManager.FADE_INW_LINUX(v9); + _vm->_graphicsManager.fadeInDefaultLength(v9); _vm->_eventsManager._rateCounter = 0; _vm->_eventsManager._escKeyFl = false; _vm->_soundManager.LOAD_ANM_SOUND(); @@ -1042,12 +1042,12 @@ LABEL_54: _vm->_graphicsManager.Copy_WinScan_Vbe(v10, ptra); } } while (!v5); - _vm->_graphicsManager.FADE_OUTW_LINUX(ptra); + _vm->_graphicsManager.fadeOutDefaultLength(ptra); ptra = _vm->_globals.freeMemory(ptra); } if (v7 == 1) { if (_vm->_graphicsManager.FADE_LINUX == 2) - _vm->_graphicsManager.FADE_OUTW_LINUX(ptr); + _vm->_graphicsManager.fadeOutDefaultLength(ptr); _vm->_globals.freeMemory(ptr); } _vm->_graphicsManager.FADE_LINUX = 0; diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp index c243dc6261..b8ac7d209c 100644 --- a/engines/hopkins/computer.cpp +++ b/engines/hopkins/computer.cpp @@ -83,7 +83,7 @@ void ComputerManager::setTextMode() { _vm->_globals.police_l = 8; _vm->_globals.police_h = 8; _vm->_graphicsManager.loadImage("WINTEXT"); - _vm->_graphicsManager.FADE_INW(); + _vm->_graphicsManager.fadeInLong(); loadMenu(); _vm->_eventsManager._mouseFl = false; } @@ -93,7 +93,7 @@ void ComputerManager::setTextMode() { */ void ComputerManager::clearScreen() { _vm->_graphicsManager.loadImage("WINTEXT"); - _vm->_graphicsManager.FADE_INW(); + _vm->_graphicsManager.fadeInLong(); } /** diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index b6a6501c98..517c496944 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -49,7 +49,7 @@ GraphicsManager::GraphicsManager() { _lineNbr2 = 0; Agr_x = Agr_y = 0; Agr_Flag_x = Agr_Flag_y = 0; - FADESPD = 15; + _fadeDefaultSpeed = 15; FADE_LINUX = 0; _skipVideoLockFl = false; no_scroll = 0; @@ -553,21 +553,26 @@ void GraphicsManager::Copy_Vga16(const byte *surface, int xp, int yp, int width, void GraphicsManager::fadeIn(const byte *palette, int step, const byte *surface) { byte palData2[PALETTE_BLOCK_SIZE]; - - // Initialise temporary palettes + int fadeStep; + if (step > 1) + fadeStep = step; + else + fadeStep = 2; + // Initialize temporary palette Common::fill(&palData2[0], &palData2[PALETTE_BLOCK_SIZE], 0); // Set current palette to black setpal_vga256(palData2); // Loop through fading in the palette - for (int fadeIndex = 0; fadeIndex < FADESPD; ++fadeIndex) { + for (int fadeIndex = 0; fadeIndex < fadeStep; ++fadeIndex) { for (int palOffset = 0; palOffset < PALETTE_BLOCK_SIZE; palOffset += 3) { - palData2[palOffset + 0] = fadeIndex * palette[palOffset + 0] / (FADESPD - 1); - palData2[palOffset + 1] = fadeIndex * palette[palOffset + 1] / (FADESPD - 1); - palData2[palOffset + 2] = fadeIndex * palette[palOffset + 2] / (FADESPD - 1); + palData2[palOffset + 0] = fadeIndex * palette[palOffset + 0] / (fadeStep - 1); + palData2[palOffset + 1] = fadeIndex * palette[palOffset + 1] / (fadeStep - 1); + palData2[palOffset + 2] = fadeIndex * palette[palOffset + 2] / (fadeStep - 1); } + // Set the transition palette and refresh the screen setpal_vga256(palData2); m_scroll16(surface, _vm->_eventsManager._startPos.x, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0); DD_VBL(); @@ -590,7 +595,7 @@ void GraphicsManager::fadeOut(const byte *palette, int step, const byte *surface byte palData[PALETTE_BLOCK_SIZE]; int tempPalette[PALETTE_BLOCK_SIZE]; - palMax = palByte = FADESPD; + palMax = palByte = _fadeDefaultSpeed; if (palette) { for (int palIndex = 0; palIndex < PALETTE_BLOCK_SIZE; palIndex++) { int palDataIndex = palIndex; @@ -634,26 +639,56 @@ void GraphicsManager::fadeOut(const byte *palette, int step, const byte *surface } } -void GraphicsManager::FADE_INS() { - FADESPD = 1; +void GraphicsManager::fadeInShort() { + _fadeDefaultSpeed = 1; fadeIn(_palette, 1, (const byte *)_vesaBuffer); } -void GraphicsManager::FADE_OUTS() { - FADESPD = 1; +void GraphicsManager::fadeOutShort() { + _fadeDefaultSpeed = 1; fadeOut(_palette, 1, (const byte *)_vesaBuffer); } -void GraphicsManager::FADE_INW() { - FADESPD = 15; +void GraphicsManager::fadeInLong() { + _fadeDefaultSpeed = 15; fadeIn(_palette, 20, (const byte *)_vesaBuffer); } -void GraphicsManager::FADE_OUTW() { - FADESPD = 15; +void GraphicsManager::fadeOutLong() { + _fadeDefaultSpeed = 15; fadeOut(_palette, 20, (const byte *)_vesaBuffer); } +void GraphicsManager::fadeOutDefaultLength(const byte *surface) { + assert(surface); + fadeOut(_palette, _fadeDefaultSpeed, surface); +} + +void GraphicsManager::fadeInDefaultLength(const byte *surface) { + assert(surface); + fadeIn(_palette, _fadeDefaultSpeed, surface); +} + +void GraphicsManager::fadeInBreakout() { + setpal_vga256(_palette); + lockScreen(); + CopyAsm16(_vesaBuffer); + unlockScreen(); + DD_VBL(); +} + +void GraphicsManager::fateOutBreakout() { + byte palette[PALETTE_EXT_BLOCK_SIZE]; + + memset(palette, 0, PALETTE_EXT_BLOCK_SIZE); + setpal_vga256(palette); + + lockScreen(); + CopyAsm16(_vesaBuffer); + unlockScreen(); + DD_VBL(); +} + void GraphicsManager::setpal_vga256(const byte *palette) { changePalette(palette); } @@ -704,36 +739,6 @@ void GraphicsManager::DD_VBL() { g_system->updateScreen(); } -void GraphicsManager::FADE_OUTW_LINUX(const byte *surface) { - assert(surface); - fadeOut(_palette, FADESPD, surface); -} - -void GraphicsManager::FADE_INW_LINUX(const byte *surface) { - assert(surface); - fadeIn(_palette, FADESPD, surface); -} - -void GraphicsManager::fadeInBreakout() { - setpal_vga256(_palette); - lockScreen(); - CopyAsm16(_vesaBuffer); - unlockScreen(); - DD_VBL(); -} - -void GraphicsManager::fateOutBreakout() { - byte palette[PALETTE_EXT_BLOCK_SIZE]; - - memset(palette, 0, PALETTE_EXT_BLOCK_SIZE); - setpal_vga256(palette); - - lockScreen(); - CopyAsm16(_vesaBuffer); - unlockScreen(); - DD_VBL(); -} - void GraphicsManager::Copy_WinScan_Vbe3(const byte *srcData, byte *destSurface) { int rleValue; int destOffset; diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h index ad05f1aa6b..4ab447b5ba 100644 --- a/engines/hopkins/graphics.h +++ b/engines/hopkins/graphics.h @@ -77,7 +77,7 @@ public: int _lineNbr2; int Agr_x, Agr_y; int Agr_Flag_x, Agr_Flag_y; - int FADESPD; + int _fadeDefaultSpeed; int FADE_LINUX; bool _skipVideoLockFl; int no_scroll; @@ -117,12 +117,12 @@ public: void Copy_Vga16(const byte *surface, int xp, int yp, int width, int height, int destX, int destY); void fadeIn(const byte *palette, int step, const byte *surface); void fadeOut(const byte *palette, int step, const byte *surface); - void FADE_INS(); - void FADE_OUTS(); - void FADE_INW(); - void FADE_OUTW(); - void FADE_OUTW_LINUX(const byte *surface); - void FADE_INW_LINUX(const byte *surface); + void fadeInShort(); + void fadeOutShort(); + void fadeInLong(); + void fadeOutLong(); + void fadeOutDefaultLength(const byte *surface); + void fadeInDefaultLength(const byte *surface); void fadeInBreakout(); void fateOutBreakout(); void setpal_vga256(const byte *palette); diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp index 34bd068f18..35ba7541ee 100644 --- a/engines/hopkins/hopkins.cpp +++ b/engines/hopkins/hopkins.cpp @@ -146,7 +146,7 @@ bool HopkinsEngine::runWin95Demo() { _graphicsManager.clearPalette(); _graphicsManager.loadImage("H2"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); if (!_eventsManager._escKeyFl) playIntro(); @@ -177,7 +177,7 @@ bool HopkinsEngine::runWin95Demo() { _globals._speed = 3; warning("TODO Fin_Interrupt_();"); warning("TODO Init_Interrupt_();"); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals.iRegul = 1; _fileManager.constructFilename(_globals.HOPSYSTEM, "PERSO.SPR"); _globals.PERSO = _fileManager.loadFile(_globals._curFilename); @@ -224,9 +224,9 @@ bool HopkinsEngine::runWin95Demo() { _graphicsManager.loadImage("fondan"); else if (_globals._language == LANG_SP) _graphicsManager.loadImage("fondes"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.delay(500); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals.iRegul = 1; _soundManager.SPECIAL_SOUND = 2; _graphicsManager.lockScreen(); @@ -242,7 +242,7 @@ bool HopkinsEngine::runWin95Demo() { _soundManager.DEL_SAMPLE(2); _soundManager.DEL_SAMPLE(3); _soundManager.DEL_SAMPLE(4); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals._saveData->data[svField170] = 1; } _globals.Max_Propre = 5; @@ -336,12 +336,12 @@ bool HopkinsEngine::runWin95Demo() { _graphicsManager.loadImage("ENDFR"); else _graphicsManager.loadImage("ENDUK"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.mouseOn(); do _eventsManager.VBL(); while (_eventsManager.getMouseButton() != 1); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); restoreSystem(); } bombExplosion(); @@ -434,9 +434,9 @@ bool HopkinsEngine::runWin95Demo() { _graphicsManager.unlockScreen(); _graphicsManager.clearPalette(); _graphicsManager.loadImage("njour3a"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.delay(5000); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals._exitId = 300; _globals.iRegul = 0; break; @@ -470,9 +470,9 @@ bool HopkinsEngine::runLinuxDemo() { _graphicsManager.unlockScreen(); _graphicsManager.loadImage("LINUX"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.delay(1500); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); if (!_globals._internetFl) { _graphicsManager.FADE_LINUX = 2; @@ -480,9 +480,9 @@ bool HopkinsEngine::runLinuxDemo() { } _graphicsManager.loadImage("H2"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.delay(500); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); if (!_eventsManager._escKeyFl) playIntro(); @@ -548,9 +548,9 @@ bool HopkinsEngine::runLinuxDemo() { _graphicsManager.loadImage("fondan"); else if (_globals._language == LANG_SP) _graphicsManager.loadImage("fondes"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.delay(500); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals.iRegul = 1; _soundManager.SPECIAL_SOUND = 2; @@ -835,7 +835,7 @@ bool HopkinsEngine::runOS2Full() { warning("_graphicsManager.loadImage(\"VERSW\");"); warning("_graphicsManager.FADE_INW();"); _eventsManager.delay(500); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals.iRegul = 1; // Added lock and unlock to avoid crash @@ -847,11 +847,11 @@ bool HopkinsEngine::runOS2Full() { // Add 16ms delay in order to match the Linux and Win95 versions _animationManager.playAnim("MP.ANM", 10, 16, 200); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); if (!_eventsManager._escKeyFl) playIntro(); _graphicsManager.loadImage("H2"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _globals.iRegul = 0; _fileManager.constructFilename(_globals.HOPSYSTEM, "PERSO.SPR"); _globals.PERSO = _fileManager.loadFile(_globals._curFilename); @@ -884,9 +884,9 @@ bool HopkinsEngine::runOS2Full() { if (!_globals._saveData->data[170]) { _soundManager.WSOUND(3); _graphicsManager.loadImage("fond"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.delay(5000); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals.iRegul = 1; _soundManager.SPECIAL_SOUND = 2; @@ -902,7 +902,7 @@ bool HopkinsEngine::runOS2Full() { _soundManager.DEL_SAMPLE(2); _soundManager.DEL_SAMPLE(3); _soundManager.DEL_SAMPLE(4); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals._saveData->data[170] = 1; } _globals.Max_Propre = 5; @@ -1057,7 +1057,7 @@ bool HopkinsEngine::runOS2Full() { _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); else if (_globals.SVGA == 1) _animationManager.playAnim("PURG1.ANM", 12, 18, 50); - _graphicsManager.FADE_OUTS(); + _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } break; @@ -1103,7 +1103,7 @@ bool HopkinsEngine::runOS2Full() { _animationManager.playAnim("PURG2A.ANM", 12, 18, 50); else if (_globals.SVGA == 1) _animationManager.playAnim("PURG2.ANM", 12, 18, 50); - _graphicsManager.FADE_OUTS(); + _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } break; @@ -1573,7 +1573,7 @@ bool HopkinsEngine::runOS2Full() { _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); else if (_globals.SVGA == 1) _animationManager.playAnim("PURG1.ANM", 12, 18, 50); - _graphicsManager.FADE_OUTS(); + _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } break; @@ -1720,7 +1720,7 @@ bool HopkinsEngine::runBeOSFull() { _objectsManager.changeObject(14); _objectsManager.addObject(14); _eventsManager.delay(500); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals.iRegul = 1; // Added lock and unlock to avoid crash @@ -1732,13 +1732,13 @@ bool HopkinsEngine::runBeOSFull() { // Add 16ms delay in order to match the Linux and Win95 versions _animationManager.playAnim("MP.ANM", 10, 16, 200); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); if (!_eventsManager._escKeyFl) playIntro(); - _graphicsManager.FADE_OUTS(); + _graphicsManager.fadeOutShort(); _graphicsManager.loadImage("H2"); - _graphicsManager.FADE_INW(); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeInLong(); + _graphicsManager.fadeOutLong(); _globals.iRegul = 0; _fileManager.constructFilename(_globals.HOPSYSTEM, "PERSO.SPR"); _globals.PERSO = _fileManager.loadFile(_globals._curFilename); @@ -1775,9 +1775,9 @@ bool HopkinsEngine::runBeOSFull() { if (!_globals._saveData->data[svField170]) { _soundManager.WSOUND(3); _graphicsManager.loadImage("FOND"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.delay(5000); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals.iRegul = 1; _soundManager.SPECIAL_SOUND = 2; @@ -1793,7 +1793,7 @@ bool HopkinsEngine::runBeOSFull() { _soundManager.DEL_SAMPLE(2); _soundManager.DEL_SAMPLE(3); _soundManager.DEL_SAMPLE(4); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals._saveData->data[svField170] = 1; } _globals.Max_Propre = 5; @@ -1947,7 +1947,7 @@ bool HopkinsEngine::runBeOSFull() { else if (_globals.SVGA == 1) _animationManager.playAnim("PURG1.ANM", 12, 18, 50); - _graphicsManager.FADE_OUTS(); + _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } break; @@ -1993,7 +1993,7 @@ bool HopkinsEngine::runBeOSFull() { _animationManager.playAnim("PURG2A.ANM", 12, 18, 50); else if (_globals.SVGA == 1) _animationManager.playAnim("PURG2.ANM", 12, 18, 50); - _graphicsManager.FADE_OUTS(); + _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } break; @@ -2464,7 +2464,7 @@ bool HopkinsEngine::runBeOSFull() { else if (_globals.SVGA == 1) _animationManager.playAnim("PURG1.ANM", 12, 18, 50); - _graphicsManager.FADE_OUTS(); + _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } break; @@ -2617,13 +2617,13 @@ bool HopkinsEngine::runWin95full() { _graphicsManager.clearPalette(); _animationManager.playAnim("MP.ANM", 10, 16, 200); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); if (!_eventsManager._escKeyFl) playIntro(); _graphicsManager.loadImage("H2"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.delay(500); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals.iRegul = 0; _fileManager.constructFilename(_globals.HOPSYSTEM, "PERSO.SPR"); @@ -2666,9 +2666,9 @@ bool HopkinsEngine::runWin95full() { _graphicsManager.loadImage("fondan"); else if (_globals._language == LANG_SP) _graphicsManager.loadImage("fondes"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.delay(500); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _soundManager.SPECIAL_SOUND = 2; _globals.iRegul = 1; _graphicsManager.lockScreen(); @@ -2684,7 +2684,7 @@ bool HopkinsEngine::runWin95full() { _soundManager.DEL_SAMPLE(2); _soundManager.DEL_SAMPLE(3); _soundManager.DEL_SAMPLE(4); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals._saveData->data[svField170] = 1; } _globals.Max_Propre = 5; @@ -2836,7 +2836,7 @@ bool HopkinsEngine::runWin95full() { _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); else if (_globals.SVGA == 1) _animationManager.playAnim("PURG1.ANM", 12, 18, 50); - _graphicsManager.FADE_OUTS(); + _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } break; @@ -2879,7 +2879,7 @@ bool HopkinsEngine::runWin95full() { _animationManager.playAnim("PURG2A.ANM", 12, 18, 50); else if (_globals.SVGA == 1) _animationManager.playAnim("PURG2.ANM", 12, 18, 50); - _graphicsManager.FADE_OUTS(); + _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } break; @@ -3345,7 +3345,7 @@ bool HopkinsEngine::runWin95full() { _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); else if (_globals.SVGA == 1) _animationManager.playAnim("PURG1.ANM", 12, 18, 50); - _graphicsManager.FADE_OUTS(); + _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } break; @@ -3491,9 +3491,9 @@ bool HopkinsEngine::runLinuxFull() { _graphicsManager.unlockScreen(); _graphicsManager.loadImage("H2"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.delay(500); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals._speed = 2; _globals.iRegul = 1; @@ -3544,9 +3544,9 @@ bool HopkinsEngine::runLinuxFull() { _graphicsManager.loadImage("fondan"); else if (_globals._language == LANG_SP) _graphicsManager.loadImage("fondes"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.delay(500); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals.iRegul = 1; _soundManager.SPECIAL_SOUND = 2; _graphicsManager.lockScreen(); @@ -4223,7 +4223,7 @@ bool HopkinsEngine::runLinuxFull() { _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); else if (_globals.SVGA == 1) _animationManager.playAnim("PURG1.ANM", 12, 18, 50); - _graphicsManager.FADE_OUTS(); + _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } break; @@ -4490,7 +4490,7 @@ void HopkinsEngine::playIntro() { _eventsManager.VBL(); _globals.iRegul = 1; - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); if (_graphicsManager._largeScreenFl) { _graphicsManager.no_scroll = 2; bool v3 = false; @@ -4516,7 +4516,7 @@ void HopkinsEngine::playIntro() { } _soundManager.mixVoice(4, 3); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _graphicsManager.no_scroll = 0; _graphicsManager.loadImage("intro2"); _graphicsManager.scrollScreen(0); @@ -4535,7 +4535,7 @@ void HopkinsEngine::playIntro() { _eventsManager.VBL(); _globals.iRegul = 1; - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); for (uint i = 0; i < 200 / _globals._speed; ++i) _eventsManager.VBL(); @@ -4642,7 +4642,7 @@ void HopkinsEngine::playIntro() { _eventsManager.VBL(); } - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _graphicsManager.FIN_VISU(); _animationManager._clearAnimationFl = true; _soundManager.WSOUND(3); @@ -4693,13 +4693,13 @@ void HopkinsEngine::PASS() { else _graphicsManager.loadImage("nduk"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); if (_soundManager._voiceOffFl) _eventsManager.delay(500); else _soundManager.mixVoice(628, 4); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals._exitId = 4; } @@ -4717,9 +4717,9 @@ void HopkinsEngine::displayEndDemo() { else _graphicsManager.loadImage("enduk"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.delay(1500); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals._exitId = 0; } @@ -4749,7 +4749,7 @@ void HopkinsEngine::bombExplosion() { _eventsManager.VBL(); } - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.mouseOff(); for (int idx = 0; idx < 20; ++idx) { @@ -4765,7 +4765,7 @@ void HopkinsEngine::bombExplosion() { _eventsManager.VBL(); } - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _graphicsManager.FIN_VISU(); _globals.iRegul = 0; _globals._exitId = 151; @@ -4784,7 +4784,7 @@ void HopkinsEngine::PUBQUIT() { _globals._disableInventFl = true; _graphicsManager.loadImage("BOX"); _soundManager.WSOUND(28); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.mouseOn(); _eventsManager.changeMouseCursor(0); _eventsManager._mouseCursorId = 0; @@ -4802,7 +4802,7 @@ void HopkinsEngine::PUBQUIT() { // Original tried to open a web browser link here. Since ScummVM doesn't support // that, it's being skipped in favor of simply exiting - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); } void HopkinsEngine::handleConflagration() { @@ -4819,7 +4819,7 @@ void HopkinsEngine::handleConflagration() { for (int cpt = 0; cpt <= 4; cpt++) _eventsManager.VBL(); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _globals.iRegul = 1; for (int cpt = 0; cpt <= 249; cpt++) @@ -4832,7 +4832,7 @@ void HopkinsEngine::handleConflagration() { for (int cpt = 0; cpt <= 49; cpt++) _eventsManager.VBL(); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _graphicsManager.FIN_VISU(); _globals._saveData->data[svField312] = 1; _globals._disableInventFl = false; @@ -4928,14 +4928,14 @@ void HopkinsEngine::BASED() { for (int cpt = 0; cpt <= 4; cpt++) _eventsManager.VBL(); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _globals.CACHE_ON(); do _eventsManager.VBL(); while (_objectsManager.BOBPOSI(8) != 22); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _graphicsManager.FIN_VISU(); _globals.resetCache(); _globals._disableInventFl = false; @@ -4971,7 +4971,7 @@ void HopkinsEngine::playEnding() { for (int cpt = 0; cpt <= 4; cpt++) _eventsManager.VBL(); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _globals.iRegul = 1; do @@ -5028,7 +5028,7 @@ void HopkinsEngine::playEnding() { _graphicsManager.FIN_VISU(); _soundManager.DEL_SAMPLE(1); _graphicsManager.loadImage("PLAN3"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager._rateCounter = 0; if (!_eventsManager._escKeyFl) { @@ -5037,7 +5037,7 @@ void HopkinsEngine::playEnding() { while (_eventsManager._rateCounter < 2000 / _globals._speed && !_eventsManager._escKeyFl); } _eventsManager._escKeyFl = false; - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals.iRegul = 1; _soundManager.SPECIAL_SOUND = 0; _graphicsManager.FADE_LINUX = 2; @@ -5077,7 +5077,7 @@ void HopkinsEngine::playEnding() { _eventsManager.VBL(); while (_objectsManager.BOBPOSI(8) != 21); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _graphicsManager.FIN_VISU(); _soundManager.DEL_SAMPLE(1); _soundManager.WSOUND(16); @@ -5183,7 +5183,7 @@ int HopkinsEngine::handleBaseMap() { _graphicsManager.SETCOLOR3(251, 100, 100, 100); _graphicsManager.SETCOLOR3(254, 0, 0, 0); _eventsManager.changeMouseCursor(0); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); bool loopCond = false; int zone; do { @@ -5228,7 +5228,7 @@ int HopkinsEngine::handleBaseMap() { } while (!loopCond); _globals._disableInventFl = false; - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); int result; switch (zone) { @@ -5369,7 +5369,7 @@ void HopkinsEngine::displayCredits() { loadCredits(); _globals.Credit_y = 436; _graphicsManager.loadImage("GENERIC"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _soundManager.WSOUND(28); _eventsManager._mouseFl = false; _globals.iRegul = 3; @@ -5422,7 +5422,7 @@ void HopkinsEngine::displayCredits() { _globals.Credit_by = -1; _globals.Credit_by1 = -1; } while ((_eventsManager.getMouseButton() != 1) && (!g_system->getEventManager()->shouldQuit())); - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _globals.iRegul = 1; _eventsManager._mouseFl = true; } @@ -5692,7 +5692,7 @@ void HopkinsEngine::OCEAN(int16 curExitId, Common::String backgroundFilename, in _eventsManager.VBL(); if (!_graphicsManager._noFadingFl) - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _graphicsManager._noFadingFl = false; _globals.iRegul = 1; @@ -5716,7 +5716,7 @@ void HopkinsEngine::OCEAN(int16 curExitId, Common::String backgroundFilename, in _globals._exitId = exit3; if (_globals._exitId == 4) _globals._exitId = exit4; - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); _objectsManager.removeSprite(0); _objectsManager.CLEAR_ECRAN(); _fileManager.constructFilename(_globals.HOPSYSTEM, "PERSO.SPR"); @@ -5744,7 +5744,7 @@ bool HopkinsEngine::displayAdultDisclaimer() { _globals._exitId = 0; _graphicsManager.loadImage("ADULT"); - _graphicsManager.FADE_INW(); + _graphicsManager.fadeInLong(); _eventsManager.mouseOn(); _eventsManager.changeMouseCursor(0); _eventsManager._mouseCursorId = 0; @@ -5764,7 +5764,7 @@ bool HopkinsEngine::displayAdultDisclaimer() { } while (!shouldQuit() && (buttonIndex == 0 || _eventsManager.getMouseButton() != 1)); _globals._disableInventFl = false; - _graphicsManager.FADE_OUTW(); + _graphicsManager.fadeOutLong(); if (buttonIndex != 2) { // Quit game diff --git a/engines/hopkins/menu.cpp b/engines/hopkins/menu.cpp index 9c9e66d5a2..c39518c7fd 100644 --- a/engines/hopkins/menu.cpp +++ b/engines/hopkins/menu.cpp @@ -82,7 +82,7 @@ int MenuManager::menu() { else if (_vm->_globals._language == LANG_SP) _vm->_graphicsManager.loadImage("MENUES"); - _vm->_graphicsManager.FADE_INW(); + _vm->_graphicsManager.fadeInLong(); if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) _vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "MENU.SPR"); @@ -234,7 +234,7 @@ int MenuManager::menu() { _vm->_globals.freeMemory(spriteData); _vm->_globals._disableInventFl = false; - _vm->_graphicsManager.FADE_OUTW(); + _vm->_graphicsManager.fadeOutLong(); return result; } diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index 507c46d65f..38e86be093 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -2312,7 +2312,7 @@ void ObjectsManager::PLAN_BETA() { _vm->_eventsManager.VBL(); _vm->_globals.iRegul = 1; - _vm->_graphicsManager.FADE_INW(); + _vm->_graphicsManager.fadeInLong(); _vm->_eventsManager.changeMouseCursor(4); _vm->_graphicsManager._noFadingFl = false; @@ -2350,7 +2350,7 @@ void ObjectsManager::PLAN_BETA() { } while (!_vm->shouldQuit() && v1 != 1); if (!_vm->_graphicsManager._noFadingFl) - _vm->_graphicsManager.FADE_OUTW(); + _vm->_graphicsManager.fadeOutLong(); _vm->_globals.iRegul = 0; _vm->_graphicsManager._noFadingFl = false; _vm->_globals.PLANX = getSpriteX(0); @@ -4432,7 +4432,7 @@ void ObjectsManager::SPECIAL_INI() { _vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0); for (int i = 0; i <= 4; i++) _vm->_eventsManager.VBL(); - _vm->_graphicsManager.FADE_INW(); + _vm->_graphicsManager.fadeInLong(); SPRITE_ON(0); for (int i = 0; i <= 4; i++) _vm->_eventsManager.VBL(); @@ -4466,7 +4466,7 @@ void ObjectsManager::SPECIAL_INI() { _vm->_eventsManager._mouseSpriteId = 4; for (int i = 0; i <= 4; i++) _vm->_eventsManager.VBL(); - _vm->_graphicsManager.FADE_INW(); + _vm->_graphicsManager.fadeInLong(); _vm->_globals.iRegul = 1; _vm->_globals._disableInventFl = false; _vm->_graphicsManager._noFadingFl = true; @@ -5015,7 +5015,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo _vm->_eventsManager.changeMouseCursor(4); for (int v6 = 0; v6 <= 4; v6++) _vm->_eventsManager.VBL(); - _vm->_graphicsManager.FADE_INW(); + _vm->_graphicsManager.fadeInLong(); if (_vm->_globals._screenId == 61) { _vm->_animationManager.playSequence("OUVRE.SEQ", 10, 4, 10); stopBobAnimation(3); @@ -5056,7 +5056,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo if (_vm->shouldQuit()) return; - _vm->_graphicsManager.FADE_OUTW(); + _vm->_graphicsManager.fadeOutLong(); if (!animFile.empty()) _vm->_graphicsManager.FIN_VISU(); if (_vm->_globals._screenId == 61) @@ -5155,7 +5155,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm _vm->_globals.iRegul = 1; if (!_vm->_graphicsManager._noFadingFl) - _vm->_graphicsManager.FADE_INW(); + _vm->_graphicsManager.fadeInLong(); _vm->_graphicsManager._noFadingFl = false; _vm->_eventsManager.changeMouseCursor(4); @@ -5203,7 +5203,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm if (_vm->_globals._exitId != 8 || _vm->_globals._screenId != 5 || !_vm->_globals._helicopterFl) { if (!_vm->_graphicsManager._noFadingFl) - _vm->_graphicsManager.FADE_OUTW(); + _vm->_graphicsManager.fadeOutLong(); _vm->_graphicsManager._noFadingFl = false; removeSprite(0); if (_twoCharactersFl) { diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp index ced66cd628..2ab68d844d 100644 --- a/engines/hopkins/script.cpp +++ b/engines/hopkins/script.cpp @@ -529,7 +529,7 @@ int ScriptManager::handleOpcode(byte *dataP) { case 13: _vm->_eventsManager._mouseButton = _vm->_eventsManager._curMouseButton; _vm->_globals._disableInventFl = true; - _vm->_graphicsManager.FADE_OUTW(); + _vm->_graphicsManager.fadeOutLong(); _vm->_globals.CACHE_OFF(); _vm->_objectsManager.removeSprite(0); _vm->_fontManager.hideText(5); @@ -538,7 +538,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_objectsManager.CLEAR_ECRAN(); if ((_vm->getPlatform() == Common::kPlatformWindows) && _vm->getIsDemo()) { - _vm->_graphicsManager.FADE_OUTW(); + _vm->_graphicsManager.fadeOutLong(); } else { _vm->_soundManager.playSound("SOUND17.WAV"); _vm->_graphicsManager.FADE_LINUX = 2; @@ -557,14 +557,14 @@ int ScriptManager::handleOpcode(byte *dataP) { } _vm->_eventsManager.mouseOff(); - _vm->_graphicsManager.FADE_INW_LINUX(_vm->_graphicsManager._vesaBuffer); + _vm->_graphicsManager.fadeInDefaultLength(_vm->_graphicsManager._vesaBuffer); do { if (_vm->shouldQuit()) return -1; // Exiting game _vm->_eventsManager.VBL(); } while (_vm->_objectsManager.BOBPOSI(3) != 100); - _vm->_graphicsManager.FADE_OUTW_LINUX(_vm->_graphicsManager._vesaBuffer); + _vm->_graphicsManager.fadeOutDefaultLength(_vm->_graphicsManager._vesaBuffer); _vm->_graphicsManager.FIN_VISU(); // If uncensored, rip the throat of the hostage @@ -587,9 +587,9 @@ int ScriptManager::handleOpcode(byte *dataP) { } _vm->_eventsManager.mouseOff(); - _vm->_graphicsManager.FADE_INW_LINUX(_vm->_graphicsManager._vesaBuffer); + _vm->_graphicsManager.fadeInDefaultLength(_vm->_graphicsManager._vesaBuffer); _vm->_objectsManager.SCI_OPTI_ONE(1, 0, 17, 3); - _vm->_graphicsManager.FADE_OUTW_LINUX(_vm->_graphicsManager._vesaBuffer); + _vm->_graphicsManager.fadeOutDefaultLength(_vm->_graphicsManager._vesaBuffer); _vm->_graphicsManager.FIN_VISU(); if ((_vm->getPlatform() == Common::kPlatformWindows) && _vm->getIsDemo()) @@ -601,7 +601,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_soundManager.SPECIAL_SOUND = 0; if ((_vm->getPlatform() == Common::kPlatformWindows) && _vm->getIsDemo()) - _vm->_graphicsManager.FADE_OUTW(); + _vm->_graphicsManager.fadeOutLong(); _vm->_globals._disableInventFl = false; _vm->_globals._helicopterFl = true; @@ -864,7 +864,7 @@ int ScriptManager::handleOpcode(byte *dataP) { break; case 51: { - _vm->_graphicsManager.FADE_OUTW(); + _vm->_graphicsManager.fadeOutLong(); _vm->_globals.CACHE_OFF(); _vm->_objectsManager.removeSprite(0); _vm->_fontManager.hideText(5); @@ -874,7 +874,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_animationManager.loadAnim("ANIM20f"); _vm->_graphicsManager.VISU_ALL(); _vm->_eventsManager.mouseOff(); - _vm->_graphicsManager.FADE_INW(); + _vm->_graphicsManager.fadeInLong(); bool v52 = false; _vm->_soundManager.LOAD_WAV("SOUND46.WAV", 1); do { @@ -888,7 +888,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_eventsManager.VBL(); } while (_vm->_objectsManager.BOBPOSI(12) != 34); _vm->_objectsManager.stopBobAnimation(2); - _vm->_graphicsManager.FADE_OUTW(); + _vm->_graphicsManager.fadeOutLong(); _vm->_graphicsManager._noFadingFl = true; _vm->_globals._exitId = 20; break; @@ -1929,7 +1929,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_soundManager.SPECIAL_SOUND = 0; _vm->_animationManager.NO_SEQ = false; _vm->_graphicsManager._noFadingFl = true; - _vm->_graphicsManager.FADE_OUTW(); + _vm->_graphicsManager.fadeOutLong(); for (int i = 1; i <= 39; i++) { if (_vm->shouldQuit()) @@ -2059,7 +2059,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_globals.NOPARLE = true; _vm->_talkManager.PARLER_PERSO("HRADIO.PE2"); _vm->_globals.NOPARLE = false; - _vm->_graphicsManager.FADE_OUTW(); + _vm->_graphicsManager.fadeOutLong(); _vm->_objectsManager.stopBobAnimation(13); _vm->_graphicsManager._noFadingFl = true; _vm->_globals._exitId = 94; @@ -2269,7 +2269,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_animationManager.playSequence2("TUNNEL.SEQ", 1, 18, 20); _vm->_animationManager.NO_SEQ = false; _vm->_graphicsManager._noFadingFl = true; - _vm->_graphicsManager.FADE_OUTW(); + _vm->_graphicsManager.fadeOutLong(); _vm->_objectsManager.PERSO_ON = false; _vm->_globals._exitId = 100; break; @@ -2277,7 +2277,7 @@ int ScriptManager::handleOpcode(byte *dataP) { case 600: if (!_vm->_globals._internetFl) { _vm->_graphicsManager.FADE_LINUX = 2; - _vm->_graphicsManager.FADESPD = 1; + _vm->_graphicsManager._fadeDefaultSpeed = 1; if (_vm->_globals.SVGA == 2) _vm->_animationManager.playAnim("BOMBE1A.ANM", 100, 18, 100); else if (_vm->_globals.SVGA == 1) @@ -2289,7 +2289,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_graphicsManager.SETCOLOR3(251, 100, 100, 100); _vm->_graphicsManager.SETCOLOR3(254, 0, 0, 0); _vm->_graphicsManager.OPTI_INI("BOMBE", 2); - _vm->_graphicsManager.FADE_INS(); + _vm->_graphicsManager.fadeInShort(); break; case 601: @@ -2344,7 +2344,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_graphicsManager.fastDisplay(_vm->_globals.SPRITE_ECRAN, 513, 163, 7); _vm->_globals.NO_VISU = false; _vm->_objectsManager.OPTI_ONE(5, 0, 16, 4); - _vm->_graphicsManager.FADE_OUTS(); + _vm->_graphicsManager.fadeOutShort(); _vm->_soundManager.SPECIAL_SOUND = 199; _vm->_graphicsManager.FADE_LINUX = 2; if (_vm->_globals.SVGA == 1) |