[Stratagus-CVS] stratagus/src/ui ccl_ui.c

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/11/29 14:58:37

Modified files:
        src/ui         : ccl_ui.c 

Log message:
        Fixed errors with lua and sdl surface

Patches:
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.160 stratagus/src/ui/ccl_ui.c:1.161
--- stratagus/src/ui/ccl_ui.c:1.160     Thu Nov 20 12:58:03 2003
+++ stratagus/src/ui/ccl_ui.c   Sat Nov 29 14:58:36 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ccl_ui.c,v 1.160 2003/11/20 17:58:03 jsalmon3 Exp $
+//     $Id: ccl_ui.c,v 1.161 2003/11/29 19:58:36 jsalmon3 Exp $
 
 //@{
 
@@ -323,7 +323,11 @@
        lua_error(l);
     }
     TheUI.Contrast = i;
+#ifdef USE_SDL_SURFACE
+    // FIXME
+#else
     VideoCreatePalette(GlobalPalette); // rebuild palette
+#endif
     MustRedraw = RedrawEverything;
 
     lua_pushnumber(l, old);
@@ -377,7 +381,11 @@
        lua_error(l);
     }
     TheUI.Brightness = i;
+#ifdef USE_SDL_SURFACE
+    // FIXME:
+#else
     VideoCreatePalette(GlobalPalette); // rebuild palette
+#endif
     MustRedraw = RedrawEverything;
 
     lua_pushnumber(l, old);
@@ -431,7 +439,11 @@
        lua_error(l);
     }
     TheUI.Saturation = i;
+#ifdef USE_SDL_SURFACE
+    // FIXME:
+#else
     VideoCreatePalette(GlobalPalette); // rebuild palette
+#endif
     MustRedraw = RedrawEverything;
 
     lua_pushnumber(l, old);
@@ -3022,13 +3034,25 @@
                                lua_error(l);
                            }
                            lua_rawgeti(l, -1, 1);
+#ifdef USE_SDL_SURFACE
+                           ui->CompletedBarColorRGB.r = LuaToNumber(l, -1);
+#else
                            ui->CompletedBarColorRGB.D24.a = LuaToNumber(l, -1);
+#endif
                            lua_pop(l, 1);
                            lua_rawgeti(l, -1, 2);
+#ifdef USE_SDL_SURFACE
+                           ui->CompletedBarColorRGB.g = LuaToNumber(l, -1);
+#else
                            ui->CompletedBarColorRGB.D24.b = LuaToNumber(l, -1);
+#endif
                            lua_pop(l, 1);
                            lua_rawgeti(l, -1, 3);
+#ifdef USE_SDL_SURFACE
+                           ui->CompletedBarColorRGB.b = LuaToNumber(l, -1);
+#else
                            ui->CompletedBarColorRGB.D24.c = LuaToNumber(l, -1);
+#endif
                            lua_pop(l, 1);
                            lua_pop(l, 1);
                        } else if (!strcmp(value, "pos")) {