Fix the broken fades.

roncli · Feb 25, 2014 · d276778 · d276778
1 parent 4b2603f
commit d276778
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/skelton/svgalib/palette.cpp b/skelton/svgalib/palette.cpp
@@ -22,6 +22,8 @@
 #include "autoconf.h"
 #endif
 
+#include "SDL.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include "types.h"
@@ -118,10 +120,7 @@ int Fade::step() {
   if(currentframe==destframe)
     return 1;
   else {
-#if 0
-    if(dynamic_cast<Video_X11_8*>(video))
-      usleep(3000);
-#endif
+    SDL_Delay(1);
     for(int i(0); i<768; i++)
       current[i]+=delta[i];
     currentframe++;

diff --git a/skelton/svgalib/video.cpp b/skelton/svgalib/video.cpp
@@ -59,6 +59,11 @@ class Video_SDL : public Video {
   }
 
   virtual void end_frame() {
+    if (newpal) {
+      pal.set();
+      newpal = false;
+    }
+
     Uint32 pixel_format;
     int w, h;
     SDL_QueryTexture(texture_, &pixel_format, NULL, &w, &h);