stratagus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: address@hidden
Subject: [Stratagus-CVS] stratagus/src/ui ccl_ui.c icons.c interface.c m...
Date: 15 Jan 2004 13:09:59 +1100

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       04/01/15 13:09:58

Modified files:
        src/ui         : ccl_ui.c icons.c interface.c mainscr.c 
                         menu_proc.c menus.c ui.c 

Log message:
        USE_SDL_SURFACE is default

Patches:
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.184 stratagus/src/ui/ccl_ui.c:1.185
--- stratagus/src/ui/ccl_ui.c:1.184     Thu Jan 15 01:06:41 2004
+++ stratagus/src/ui/ccl_ui.c   Thu Jan 15 13:09:55 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: ccl_ui.c,v 1.184 2004/01/14 14:06:41 nobody_ Exp $
+//      $Id: ccl_ui.c,v 1.185 2004/01/15 02:09:55 jsalmon3 Exp $
 
 //@{
 
@@ -1540,25 +1540,13 @@
                                                                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")) {
Index: stratagus/src/ui/icons.c
diff -u stratagus/src/ui/icons.c:1.64 stratagus/src/ui/icons.c:1.65
--- stratagus/src/ui/icons.c:1.64       Thu Jan 15 04:50:04 2004
+++ stratagus/src/ui/icons.c    Thu Jan 15 13:09:55 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: icons.c,v 1.64 2004/01/14 17:50:04 jsalmon3 Exp $
+//      $Id: icons.c,v 1.65 2004/01/15 02:09:55 jsalmon3 Exp $
 
 //@{
 
@@ -370,11 +370,7 @@
 global void DrawUnitIcon(const Player* player, Icon* icon, unsigned flags,
        int x, int y)
 {
-#ifdef USE_SDL_SURFACE
        Uint32 color;
-#else
-       VMemType color;
-#endif
        int width;
        int height;
 
@@ -433,7 +429,7 @@
        int i;
 
        CLprintf(file, "\n--- -----------------------------------------\n");
-       CLprintf(file, "--- MODULE: icons $Id: icons.c,v 1.64 2004/01/14 
17:50:04 jsalmon3 Exp $\n\n");
+       CLprintf(file, "--- MODULE: icons $Id: icons.c,v 1.65 2004/01/15 
02:09:55 jsalmon3 Exp $\n\n");
 
        //
        //  Mapping the original icon numbers in puds to our internal strings
Index: stratagus/src/ui/interface.c
diff -u stratagus/src/ui/interface.c:1.151 stratagus/src/ui/interface.c:1.152
--- stratagus/src/ui/interface.c:1.151  Fri Jan  2 12:14:18 2004
+++ stratagus/src/ui/interface.c        Thu Jan 15 13:09:56 2004
@@ -5,12 +5,12 @@
 //     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
 //             \/                  \/          \//_____/            \/
 //  ______________________                           ______________________
-//                       T H E   W A R   B E G I N S
-//        Stratagus - A free fantasy real time strategy game engine
+//                        T H E   W A R   B E G I N S
+//         Stratagus - A free fantasy real time strategy game engine
 //
-/address@hidden interface.c    -       The interface. */
+/address@hidden interface.c - The interface. */
 //
-//     (c) Copyright 1998-2003 by Lutz Sammer
+//      (c) Copyright 1998-2004 by Lutz Sammer and Jimmy Salmon
 //
 //      This program is free software; you can redistribute it and/or modify
 //      it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: interface.c,v 1.151 2004/01/02 01:14:18 jsalmon3 Exp $
+//      $Id: interface.c,v 1.152 2004/01/15 02:09:56 jsalmon3 Exp $
 
 //@{
 
@@ -504,13 +504,7 @@
                EnableRedraw |= RedrawMap | RedrawAll;
                MustRedraw |= RedrawEverything;
                SetStatusLine("Big map enabled");
-#ifdef USE_SDL_SURFACE
                VideoClearScreen();
-#else
-               VideoLockScreen();
-               VideoClearScreen();
-               VideoUnlockScreen();
-#endif
        } else {
                TheUI.MapArea.X = mapx;
                TheUI.MapArea.Y = mapy;
@@ -522,13 +516,7 @@
                EnableRedraw = RedrawEverything;
                MustRedraw = RedrawEverything;
                SetStatusLine("Returning to old map");
-#ifdef USE_SDL_SURFACE
                VideoClearScreen();
-#else
-               VideoLockScreen();
-               VideoClearScreen();
-               VideoUnlockScreen();
-#endif
        }
 }
 
Index: stratagus/src/ui/mainscr.c
diff -u stratagus/src/ui/mainscr.c:1.152 stratagus/src/ui/mainscr.c:1.153
--- stratagus/src/ui/mainscr.c:1.152    Thu Jan 15 11:57:00 2004
+++ stratagus/src/ui/mainscr.c  Thu Jan 15 13:09:56 2004
@@ -5,13 +5,13 @@
 //     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
 //             \/                  \/          \//_____/            \/
 //  ______________________                           ______________________
-//                       T H E   W A R   B E G I N S
-//        Stratagus - A free fantasy real time strategy game engine
+//                        T H E   W A R   B E G I N S
+//         Stratagus - A free fantasy real time strategy game engine
 //
-/address@hidden mainscr.c      -       The main screen. */
+/address@hidden mainscr.c - The main screen. */
 //
-//     (c) Copyright 1998,2000-2003 by Lutz Sammer, Valery Shchedrin,
-//                                  and Jimmy Salmon
+//      (c) Copyright 1998-2004 by Lutz Sammer, Valery Shchedrin,
+//                                 and Jimmy Salmon
 //
 //      This program is free software; you can redistribute it and/or modify
 //      it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: mainscr.c,v 1.152 2004/01/15 00:57:00 wizzard Exp $
+//      $Id: mainscr.c,v 1.153 2004/01/15 02:09:56 jsalmon3 Exp $
 
 //@{
 
@@ -80,11 +80,7 @@
 local void UiDrawLifeBar(const Unit* unit, int x, int y)
 {
        int f;
-#ifdef USE_SDL_SURFACE
        Uint32 color;
-#else
-       VMemType color;
-#endif
 
        y += unit->Type->Icon.Icon->Height + 7;
        VideoFillRectangleClip(ColorBlack, x, y,
Index: stratagus/src/ui/menu_proc.c
diff -u stratagus/src/ui/menu_proc.c:1.120 stratagus/src/ui/menu_proc.c:1.121
--- stratagus/src/ui/menu_proc.c:1.120  Fri Jan  9 16:44:43 2004
+++ stratagus/src/ui/menu_proc.c        Thu Jan 15 13:09:56 2004
@@ -5,12 +5,12 @@
 //     /_______  /|__|  |__|  (____  /__| (____  /\___  /|____//____  >
 //             \/                  \/          \//_____/            \/
 //  ______________________                           ______________________
-//                       T H E   W A R   B E G I N S
-//        Stratagus - A free fantasy real time strategy game engine
+//                        T H E   W A R   B E G I N S
+//         Stratagus - A free fantasy real time strategy game engine
 //
-/address@hidden menu_proc.c    -       The menu processing code. */
+/address@hidden menu_proc.c - The menu processing code. */
 //
-//     (c) Copyright 1999-2003 by Andreas Arens, Jimmy Salmon, Nehal Mistry
+//      (c) Copyright 1999-2004 by Andreas Arens, Jimmy Salmon, Nehal Mistry
 //
 //      This program is free software; you can redistribute it and/or modify
 //      it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: menu_proc.c,v 1.120 2004/01/09 05:44:43 jsalmon3 Exp $
+//      $Id: menu_proc.c,v 1.121 2004/01/15 02:09:56 jsalmon3 Exp $
 
 //@{
 
@@ -1028,12 +1028,8 @@
 
        if (menu->Panel && !strcmp(menu->Panel, ScPanel)) {
                // Background
-#ifdef USE_SDL_SURFACE
                VideoFillTransRectangle(ColorBlack, MenuRedrawX + 1,
                                MenuRedrawY + 1, MenuRedrawW - 2, MenuRedrawH - 
2, 50);
-#else
-               VideoFill50TransRectangle(ColorBlack, MenuRedrawX + 1, 
MenuRedrawY + 1, MenuRedrawW - 2, MenuRedrawH - 2);
-#endif
                VideoDrawHLineClip(ColorBlue, MenuRedrawX + 3, MenuRedrawY, 
MenuRedrawW - 6);
                VideoDrawHLineClip(ColorBlue, MenuRedrawX + 3, MenuRedrawY + 
MenuRedrawH - 1, MenuRedrawW - 6);
                VideoDrawVLineClip(ColorBlue, MenuRedrawX, MenuRedrawY + 3, 
MenuRedrawH - 6);
@@ -2427,13 +2423,7 @@
        }
 
        ButtonUnderCursor = -1;
-#ifdef USE_SDL_SURFACE
-       HideAnyCursor();
-#else
-       VideoLockScreen();
        HideAnyCursor();
-       VideoUnlockScreen();
-#endif
        DestroyCursorBackground();
        MustRedraw |= RedrawCursor;
        CursorState = CursorStatePoint;
Index: stratagus/src/ui/menus.c
diff -u stratagus/src/ui/menus.c:1.604 stratagus/src/ui/menus.c:1.605
--- stratagus/src/ui/menus.c:1.604      Sat Jan 10 17:13:01 2004
+++ stratagus/src/ui/menus.c    Thu Jan 15 13:09:56 2004
@@ -8,7 +8,7 @@
 //                        T H E   W A R   B E G I N S
 //         Stratagus - A free fantasy real time strategy game engine
 //
-/address@hidden menus.c        -       The menu function code. */
+/address@hidden menus.c - The menu function code. */
 //
 //      (c) Copyright 1999-2004 by Andreas Arens, Jimmy Salmon, Nehal Mistry
 //
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: menus.c,v 1.604 2004/01/10 06:13:01 jsalmon3 Exp $
+//      $Id: menus.c,v 1.605 2004/01/15 02:09:56 jsalmon3 Exp $
 
 //@{
 
@@ -1775,13 +1775,7 @@
                                (*menu->Items[i].initfunc)(menu->Items + i);
                        }
                }
-#ifdef USE_SDL_SURFACE
                DrawMenu(menu);
-#else
-               VideoLockScreen();
-               DrawMenu(menu);
-               VideoUnlockScreen();
-#endif
        }
        GlobalOptionsInit(NULL);
 }
@@ -2806,15 +2800,8 @@
        int i;
        Menu* menu;
 
-#ifdef USE_SDL_SURFACE
        MenusSetBackground();
        Invalidate();
-#else
-       VideoLockScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-       Invalidate();
-#endif
 
        menu = FindMenu("menu-campaign-select");
        DebugLevel0Fn("%d campaigns available\n" _C_ NumCampaigns);
@@ -2862,15 +2849,8 @@
 */
 local void StartCampaignFromMenu(int number)
 {
-#ifdef USE_SDL_SURFACE
        MenusSetBackground();
        Invalidate();
-#else
-       VideoLockScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-       Invalidate();
-#endif
 
 #if 0
        // JOHNS: this is currently not needed:
@@ -2885,17 +2865,9 @@
        PlayCampaign(Campaigns[number].Ident);
        GuiGameStarted = 1;
 
-#ifdef USE_SDL_SURFACE
-       MenusSetBackground();
-       VideoClearScreen();
-       Invalidate();
-#else
-       VideoLockScreen();
        MenusSetBackground();
        VideoClearScreen();
-       VideoUnlockScreen();
        Invalidate();
-#endif
 
        // FIXME: johns otherwise crash in UpdateDisplay -> DrawMinimapCursor
        EndMenu();
@@ -3009,15 +2981,8 @@
        char *port;
        Menu *menu;
 
-#ifdef USE_SDL_SURFACE
        MenusSetBackground();
        Invalidate();
-#else
-       VideoLockScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-       Invalidate();
-#endif
 
        //
        //  Prepare enter ip/hostname menu
@@ -3048,13 +3013,7 @@
 
        ProcessMenu("menu-enter-server", 1);
 
-#ifdef USE_SDL_SURFACE
        MenusSetBackground();
-#else
-       VideoLockScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-#endif
 
        if (menu->Items[1].d.input.nch == 0) {
                return;
@@ -3069,13 +3028,7 @@
        server_host_buffer[menu->Items[1].d.input.nch] = 0;
        if (NetworkSetupServerAddress(server_host_buffer)) {
                NetErrorMenu("Unable to lookup host.");
-#ifdef USE_SDL_SURFACE
                MenusSetBackground();
-#else
-               VideoLockScreen();
-               MenusSetBackground();
-               VideoUnlockScreen();
-#endif
                return;
        }
        NetworkInitClientConnect();
@@ -3093,15 +3046,8 @@
        ProcessMenu("menu-net-connecting", 1);
 
        if (GuiGameStarted) {
-#ifdef USE_SDL_SURFACE
                MenusSetBackground();
                Invalidate();
-#else
-               VideoLockScreen();
-               MenusSetBackground();
-               VideoUnlockScreen();
-               Invalidate();
-#endif
                EndMenu();
        }
 }
@@ -3129,13 +3075,7 @@
 */
 local void NetConnectingCancel(void)
 {
-#ifdef USE_SDL_SURFACE
        MenusSetBackground();
-#else
-       VideoLockScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-#endif
        NetworkExitClientConnect();
        // Trigger TerminateNetConnect() to call us again and end the menu
        NetLocalState = ccs_usercanceled;
@@ -3229,15 +3169,8 @@
 */
 local void MultiGameStart(void)
 {
-#ifdef USE_SDL_SURFACE
        MenusSetBackground();
        Invalidate();
-#else
-       VideoLockScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-       Invalidate();
-#endif
 
        if (MetaServerInUse) {
                SendMetaCommand("StartGame","");
@@ -3259,15 +3192,8 @@
        char NameBuf[32];
        Menu *menu;
 
-#ifdef USE_SDL_SURFACE
        MenusSetBackground();
        Invalidate();
-#else
-       VideoLockScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-       Invalidate();
-#endif
 
        menu = FindMenu("menu-enter-name");
        menu->Items[1].d.input.buffer = NameBuf;
@@ -3279,13 +3205,7 @@
 
        ProcessMenu("menu-enter-name", 1);
 
-#ifdef USE_SDL_SURFACE
-       MenusSetBackground();
-#else
-       VideoLockScreen();
        MenusSetBackground();
-       VideoUnlockScreen();
-#endif
 
        if (menu->Items[1].d.input.nch == 0) {
                return;
@@ -3916,13 +3836,7 @@
 */
 local void GameCancel(void)
 {
-#ifdef USE_SDL_SURFACE
-       MenusSetBackground();
-#else
-       VideoLockScreen();
        MenusSetBackground();
-       VideoUnlockScreen();
-#endif
        FreeMapInfo(MenuMapInfo);
        MenuMapInfo = NULL;
        EndMenu();
@@ -4901,15 +4815,8 @@
 */
 local void StartEditor(void)
 {
-#ifdef USE_SDL_SURFACE
-       MenusSetBackground();
-       Invalidate();
-#else
-       VideoLockScreen();
        MenusSetBackground();
-       VideoUnlockScreen();
        Invalidate();
-#endif
 
        SetupEditor();
 
@@ -4972,15 +4879,8 @@
        char height[10];
        char description[36];
 
-#ifdef USE_SDL_SURFACE
        MenusSetBackground();
        Invalidate();
-#else
-       VideoLockScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-       Invalidate();
-#endif
 
        EditorCancelled = 0;
 
@@ -5001,13 +4901,7 @@
        ProcessMenu("menu-editor-new", 1);
 
        if (EditorCancelled) {
-#ifdef USE_SDL_SURFACE
                MenusSetBackground();
-#else
-               VideoLockScreen();
-               MenusSetBackground();
-               VideoUnlockScreen();
-#endif
                return;
        }
 
@@ -5018,13 +4912,7 @@
        TheMap.Info->MapWidth = atoi(width);
        TheMap.Info->MapHeight = atoi(height);
 
-#ifdef USE_SDL_SURFACE
        VideoClearScreen();
-#else
-       VideoLockScreen();
-       VideoClearScreen();
-       VideoUnlockScreen();
-#endif
 
        *CurrentMapPath = '\0';
 
@@ -5131,23 +5019,11 @@
        GetInfoFromSelectPath();
 
        if (EditorCancelled) {
-#ifdef USE_SDL_SURFACE
                MenusSetBackground();
-#else
-               VideoLockScreen();
-               MenusSetBackground();
-               VideoUnlockScreen();
-#endif
                return;
        }
 
-#ifdef USE_SDL_SURFACE
        VideoClearScreen();
-#else
-       VideoLockScreen();
-       VideoClearScreen();
-       VideoUnlockScreen();
-#endif
 
        if (ScenSelectPath[0]) {
                s = ScenSelectPath + strlen(ScenSelectPath);
@@ -5572,13 +5448,7 @@
                return;
        }
 
-#ifdef USE_SDL_SURFACE
        VideoClearScreen();
-#else
-       VideoLockScreen();
-       VideoClearScreen();
-       VideoUnlockScreen();
-#endif
 
        if (ScenSelectPath[0]) {
                s = ScenSelectPath + strlen(ScenSelectPath);
@@ -6487,17 +6357,9 @@
 #endif
        *ScenSelectDisplayPath = '\0';
 
-#ifdef USE_SDL_SURFACE
        VideoClearScreen();
        MenusSetBackground();
        Invalidate();
-#else
-       VideoLockScreen();
-       VideoClearScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-       Invalidate();
-#endif
 
        GuiGameStarted = 0;
        ProcessMenu("menu-replay-game", 1);
@@ -7029,15 +6891,8 @@
 local void MultiGameMasterReport(void)
 {
 //     EndMenu();
-#ifdef USE_SDL_SURFACE
-       MenusSetBackground();
-       Invalidate();
-#else
-       VideoLockScreen();
        MenusSetBackground();
-       VideoUnlockScreen();
        Invalidate();
-#endif
 
        ProcessMenu("metaserver-list", 1);
        if (GuiGameStarted) {
@@ -7052,15 +6907,8 @@
 local void ShowMetaServerList(void)
 {
        EndMenu();
-#ifdef USE_SDL_SURFACE
        Invalidate();
        MenusSetBackground();
-#else
-       Invalidate();
-       VideoLockScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-#endif
 
        DestroyCursorBackground();
        GuiGameStarted = 0;
@@ -7174,15 +7022,8 @@
 {
        // TODO: how to free stuff?
 //     EndMenu();
-#ifdef USE_SDL_SURFACE
        MenusSetBackground();
        Invalidate();
-#else
-       VideoLockScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-       Invalidate();
-#endif
 //     EndMenu();
 }
 
@@ -7197,15 +7038,8 @@
 
        j = mi - mi->menu->Items;
        mi->menu->Items[j].d.gem.state = MI_GSTATE_UNCHECKED;
-#ifdef USE_SDL_SURFACE
        MenusSetBackground();
        Invalidate();
-#else
-       VideoLockScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-       Invalidate();
-#endif
        EndMenu();
 
        strcpy(server_host_buffer, mi->menu->Items[j - 4].d.text.text);
@@ -7220,13 +7054,7 @@
 //     server_host_buffer[menu->Items[1].d.input.nch] = 0;
        if (NetworkSetupServerAddress(server_host_buffer)) {
                NetErrorMenu("Unable to lookup host.");
-#ifdef USE_SDL_SURFACE
-               MenusSetBackground();
-#else
-               VideoLockScreen();
                MenusSetBackground();
-               VideoUnlockScreen();
-#endif
                ProcessMenu("metaserver-list", 1);
                return;
        }
@@ -7245,15 +7073,8 @@
        ProcessMenu("menu-net-connecting", 1);
 
        if (GuiGameStarted) {
-#ifdef USE_SDL_SURFACE
-               MenusSetBackground();
-               Invalidate();
-#else
-               VideoLockScreen();
                MenusSetBackground();
-               VideoUnlockScreen();
                Invalidate();
-#endif
                EndMenu();
        }
 }
@@ -7307,13 +7128,7 @@
 {
        Invalidate();
        NetErrorMenu("Cannot Connect to Meta-Server");
-#ifdef USE_SDL_SURFACE
        MenusSetBackground();
-#else
-       VideoLockScreen();
-       MenusSetBackground();
-       VideoUnlockScreen();
-#endif
        return 0;
 }
 
Index: stratagus/src/ui/ui.c
diff -u stratagus/src/ui/ui.c:1.98 stratagus/src/ui/ui.c:1.99
--- stratagus/src/ui/ui.c:1.98  Thu Jan 15 11:57:01 2004
+++ stratagus/src/ui/ui.c       Thu Jan 15 13:09:57 2004
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: ui.c,v 1.98 2004/01/15 00:57:01 wizzard Exp $
+//      $Id: ui.c,v 1.99 2004/01/15 02:09:57 jsalmon3 Exp $
 
 //@{
 
@@ -183,15 +183,10 @@
                SetViewportMode(VIEWPORT_SINGLE);
        }
 
-#ifdef USE_SDL_SURFACE
        TheUI.CompletedBarColor = SDL_MapRGB(TheScreen->format,
                TheUI.CompletedBarColorRGB.r,
                TheUI.CompletedBarColorRGB.g,
                TheUI.CompletedBarColorRGB.b);
-#else
-       TheUI.CompletedBarColor = VideoMapRGB(TheUI.CompletedBarColorRGB.D24.a,
-               TheUI.CompletedBarColorRGB.D24.b, 
TheUI.CompletedBarColorRGB.D24.c);
-#endif
        TheUI.ViewportCursorColor = ColorWhite;
 }
 
@@ -512,13 +507,8 @@
        CLprintf(file, ")");
 
        CLprintf(file, "\n      'completed-bar (list");
-#ifdef USE_SDL_SURFACE
        CLprintf(file, "\n        'color '(%d %d %d)", 
ui->CompletedBarColorRGB.r,
                ui->CompletedBarColorRGB.g, ui->CompletedBarColorRGB.b);
-#else
-       CLprintf(file, "\n        'color '(%d %d %d)", 
ui->CompletedBarColorRGB.D24.a,
-               ui->CompletedBarColorRGB.D24.b, ui->CompletedBarColorRGB.D24.c);
-#endif
        CLprintf(file, "\n        'pos '(%d %d)", ui->CompletedBarX, 
ui->CompletedBarY);
        CLprintf(file, "\n        'size '(%d %d)", ui->CompletedBarW, 
ui->CompletedBarH);
        CLprintf(file, "\n        'text (list", ui->CompletedBarText);
@@ -687,7 +677,7 @@
        int i;
 
        CLprintf(file, "\n;;; -----------------------------------------\n");
-       CLprintf(file, ";;; MODULE: ui $Id: ui.c,v 1.98 2004/01/15 00:57:01 
wizzard Exp $\n\n");
+       CLprintf(file, ";;; MODULE: ui $Id: ui.c,v 1.99 2004/01/15 02:09:57 
jsalmon3 Exp $\n\n");
 
        // Scrolling
        CLprintf(file, "(set-mouse-scroll! %s)\n", TheUI.MouseScroll ? "#t" : 
"#f");




reply via email to

[Prev in Thread] Current Thread [Next in Thread]