Ticket #8265: bs2_fade_server.diff

scummvm/bs2/driver/palette.cpp

@@ -154 +154 @@
 //#include "ddraw.h"
 
 #include "stdafx.h"
+#include "common/util.h"
 #include "driver96.h"
 #include "d_draw.h"
+#include "../sword2.h"
 
 #define PALTABLESIZE 64*64*64
 
@@ -407 +409 @@
 }
 
 
-void FadeServer(void)
+void FadeServer(void *engine)
 
 {
-        warning("stub FadeServer");
+        BS2State *bs2 = (BS2State *) engine;
+        int32 currentTime;
+        int16 fadeMultiplier;
+        int16 i;
+
+        StackLock lock(bs2->_paletteMutex);
+
+        switch (fadeStatus) {
+                case RDFADE_UP:
+                        currentTime = SVM_timeGetTime();
+                        if (currentTime >= fadeStartTime + fadeTotalTime) {
+                                fadeStatus = RDFADE_NONE;
+                                bs2->_system->set_palette((const byte *) palCopy, 0, 256);
+                        } else {
+                                fadeMultiplier = (int16) (((int32) (currentTime - fadeStartTime) * 256) / fadeTotalTime);
+                                for (i=0; i<256; i++) {
+                                        fadePalette[i][0] = (palCopy[i][0] * fadeMultiplier) >> 8;
+                                        fadePalette[i][1] = (palCopy[i][1] * fadeMultiplier) >> 8;
+                                        fadePalette[i][2] = (palCopy[i][2] * fadeMultiplier) >> 8;
+                                }
+                                bs2->_system->set_palette((const byte *) fadePalette, 0, 256);
+                        }
+                        break;
+
+                case RDFADE_DOWN:
+                        currentTime = SVM_timeGetTime();
+                        if (currentTime >= fadeStartTime + fadeTotalTime) {
+                                memset(fadePalette, 0, sizeof(fadePalette));
+                                fadeStatus = RDFADE_BLACK;
+                        } else {
+                                fadeMultiplier = (int16) (((int32) (fadeTotalTime - (currentTime - fadeStartTime)) * 256) / fadeTotalTime);
+                                for (i=0; i<256; i++) {
+                                        fadePalette[i][0] = (palCopy[i][0] * fadeMultiplier) >> 8;
+                                        fadePalette[i][1] = (palCopy[i][1] * fadeMultiplier) >> 8;
+                                        fadePalette[i][2] = (palCopy[i][2] * fadeMultiplier) >> 8;
+                                }
+                        }
+                        bs2->_system->set_palette((const byte *) fadePalette, 0, 256);
+                        break;
+        }
+
 /*
         int32 currentTime;
         int16 fadeMultiplier;

scummvm/bs2/driver/palette.h

@@ -59 +59 @@
 extern uint8 paletteMatch[64*64*64];
 
 extern int32 RestorePalette(void);
-extern void FadeServer(void);
+extern void FadeServer(void *engine);
 
 
 #endif

scummvm/bs2/sword2.cpp

@@ -24 +24 @@
 
 #include "stdafx.h"
 #include "driver/driver96.h"
+#include "driver/palette.h"
 #include "common/gameDetector.h"
+#include "common/timer.h"
 #include "build_display.h"
 #include "console.h"
 #include "controls.h"
@@ -258 +260 @@
 
         Zdebug("CALLING: InitialiseWindow");
         // rv = InitialiseWindow(hInstance, hPrevInstance, lpCmdLine, nCmdShow, "Revolution");
+
+        _paletteMutex = _system->create_mutex();
+        _timer->installProcedure(FadeServer, 40000 / 25);
+
         rv = RD_OK;
         Zdebug("RETURNED with rv = %.8x", rv);
         if (rv != RD_OK)

scummvm/bs2/sword2.h

@@ -60 +60 @@
                 GameDetector *_detector;
                 uint32 _features;
                 byte _gameId;
+                OSystem::MutexRef _paletteMutex;
         private:
                 bool _quit;
 };