diff options
| author | Bendegúz Nagy | 2016-08-15 10:42:21 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 3fdd68fe315eddb87cd901a88737d8afb5ad8ba7 (patch) | |
| tree | e1e82853a033d6df8fc816c85b59f40d28ecec46 | |
| parent | 514bad0d09d9abcb1a5ab8ac2016c048d7286fcd (diff) | |
| download | scummvm-rg350-3fdd68fe315eddb87cd901a88737d8afb5ad8ba7.tar.gz scummvm-rg350-3fdd68fe315eddb87cd901a88737d8afb5ad8ba7.tar.bz2 scummvm-rg350-3fdd68fe315eddb87cd901a88737d8afb5ad8ba7.zip | |
DM: Minor adjustment to fuseSequence timing
| -rw-r--r-- | engines/dm/dm.cpp | 3 | ||||
| -rw-r--r-- | engines/dm/gfx.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp index cf0202e1a0..66475dbea4 100644 --- a/engines/dm/dm.cpp +++ b/engines/dm/dm.cpp @@ -927,10 +927,9 @@ void DMEngine::f445_STARTEND_fuseSequenceUpdate() { f65_playPendingSound(); _eventMan->f357_discardAllInput(); _displayMan->updateScreen(); - f22_delay(1); + f22_delay(2); _g313_gameTime++; /* BUG0_71 Some timings are too short on fast computers. The ending animation when Lord Chaos is fused plays too quickly because the execution speed is not limited */ - } } // End of namespace DM diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp index 62282e664e..3c4bfaca68 100644 --- a/engines/dm/gfx.cpp +++ b/engines/dm/gfx.cpp @@ -834,8 +834,8 @@ void DisplayMan::f135_fillBoxBitmap(byte* destBitmap, Box &box, Color color, int void DisplayMan::f133_blitBoxFilledWithMaskedBitmap(byte* src, byte* dest, byte* mask, byte* tmp, Box& box, int16 lastUnitIndex, int16 firstUnitIndex, int16 destByteWidth, Color transparent, int16 xPos, int16 yPos, int16 destHeight, int16 height2) { - // make sure to take care of inclusive boundaries - warning(false, "STUB FUNCTION: does nothing at all"); + // make sure to take care of inclusive boundaries, color can have 0x8000 flag to not use mask + } |