Ticket #1790: var_fade_delay.diff

scumm/gfx.cpp

@@ -52 +52 @@
 
 enum {
         kScrolltime = 500,  // ms scrolling is supposed to take
-        kPictureDelay = 20
+        kPictureDelay = 20,
+        kFadeDelay = 4 // 1/4th of a jiffie
 };
 
 #define NUM_SHAKE_POSITIONS 8
@@ -3103 +3104 @@
         int bottom;
         int l, t, r, b;
         const int height = MIN((int)virtscr[0].h, _screenHeight);
+        const int delay = (VAR_FADE_DELAY != 0xFF) ? VAR(VAR_FADE_DELAY) * kFadeDelay : kPictureDelay;
 
         for (i = 0; i < 16; i++) {
                 delta[i] = transitionEffects[a].deltaTable[i];
@@ -3146 +3148 @@
 
                 // Draw the current state to the screen and wait a few secs so the
                 // user can watch the effect taking place.
-                waitForTimer(VAR_FADE_DELAY != 0xFF ? VAR(VAR_FADE_DELAY) * 10 : 30);
+                waitForTimer(delay);
         }
 }
 
@@ -3271 +3273 @@
 
         int x, y;
         int step;
+        const int delay = (VAR_FADE_DELAY != 0xFF) ? VAR(VAR_FADE_DELAY) * kFadeDelay : kPictureDelay;
 
         if ((dir == 0) || (dir == 1))
                 step = vs->h;
         else
                 step = vs->w;
 
-        step = (step * kPictureDelay) / kScrolltime;
+        step = (step * delay) / kScrolltime;
 
         switch (dir) {
         case 0:
@@ -3290 +3293 @@
                                 0, vs->h - step,
                                 vs->w, step);
                         _system->updateScreen();
-                        waitForTimer(kPictureDelay);
+                        waitForTimer(delay);
 
                         y += step;
                 }
@@ -3305 +3308 @@
                                 0, 0,
                                 vs->w, step);
                         _system->updateScreen();
-                        waitForTimer(kPictureDelay);
+                        waitForTimer(delay);
 
                         y += step;
                 }
@@ -3320 +3323 @@
                                 vs->w - step, 0,
                                 step, vs->h);
                         _system->updateScreen();
-                        waitForTimer(kPictureDelay);
+                        waitForTimer(delay);
 
                         x += step;
                 }
@@ -3335 +3338 @@
                                 0, 0,
                                 step, vs->h);
                         _system->updateScreen();
-                        waitForTimer(kPictureDelay);
+                        waitForTimer(delay);
 
                         x += step;
                 }