stratagus-cvs
[Top][All Lists]
Advanced

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

[Stratagus-CVS] stratagus/src game/game.c map/map_draw.c video/...


From: address@hidden
Subject: [Stratagus-CVS] stratagus/src game/game.c map/map_draw.c video/...
Date: 15 Jan 2004 04:45:37 +1100

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       04/01/15 04:45:36

Modified files:
        src/game       : game.c 
        src/map        : map_draw.c 
        src/video      : video.c 

Log message:
        Removed MapColorCycle with SDL surfaces

Patches:
Index: stratagus/src/game/game.c
diff -u stratagus/src/game/game.c:1.121 stratagus/src/game/game.c:1.122
--- stratagus/src/game/game.c:1.121     Fri Jan  9 16:44:36 2004
+++ stratagus/src/game/game.c   Thu Jan 15 04:45:33 2004
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: game.c,v 1.121 2004/01/09 05:44:36 jsalmon3 Exp $
+//      $Id: game.c,v 1.122 2004/01/14 17:45:33 jsalmon3 Exp $
 
 //@{
 
@@ -424,7 +424,9 @@
        InitMap();         // setup draw functions
        InitMapFogOfWar(); // build tables for fog of war
        PreprocessMap();   // Adjust map for use
+#ifndef USE_SDL_SURFACE
        MapColorCycle();   // Setup color cycle
+#endif
 
        InitUserInterface(ThisPlayer->RaceName); // Setup the user interface
        LoadUserInterface(); // Load the user interface grafics
Index: stratagus/src/map/map_draw.c
diff -u stratagus/src/map/map_draw.c:1.57 stratagus/src/map/map_draw.c:1.58
--- stratagus/src/map/map_draw.c:1.57   Wed Dec 24 11:35:21 2003
+++ stratagus/src/map/map_draw.c        Thu Jan 15 04:45:34 2004
@@ -29,7 +29,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//             $Id: map_draw.c,v 1.57 2003/12/24 00:35:21 wizzard Exp $
+//             $Id: map_draw.c,v 1.58 2004/01/14 17:45:34 jsalmon3 Exp $
 
 //@{
 
@@ -2506,6 +2506,7 @@
 --             Global functions
 ----------------------------------------------------------------------------*/
 
+#ifndef USE_SDL_SURFACE
 /**
 **             Called if color cycled.
 **             Must mark color cycled tiles as dirty.
@@ -2531,10 +2532,6 @@
        }
 #endif
 
-#ifdef USE_SDL_SURFACE
-       // FIXME: what to do?
-       i = 0;
-#else
        if (VideoBpp == 15 || VideoBpp == 16) {
                //
                //              Convert 16 bit pixel table into two 32 bit 
tables.
@@ -2544,8 +2541,8 @@
                        PixelsHigh[i] = 
(((VMemType16*)TheMap.TileData->Pixels)[i] & 0xFFFF) << 16;
                }
        }
-#endif
 }
+#endif
 
 /**
 **             Mark position inside viewport be drawn for next display update.
@@ -2903,7 +2900,9 @@
 */
 global void InitMap(void)
 {
+#ifndef USE_SDL_SURFACE
        MapColorCycle();
+#endif
 
 #ifdef USE_OPENGL
        MapDrawTile = MapDrawTileOpenGL;
Index: stratagus/src/video/video.c
diff -u stratagus/src/video/video.c:1.85 stratagus/src/video/video.c:1.86
--- stratagus/src/video/video.c:1.85    Wed Jan 14 16:42:11 2004
+++ stratagus/src/video/video.c Thu Jan 15 04:45:36 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: video.c,v 1.85 2004/01/14 05:42:11 jsalmon3 Exp $
+//     $Id: video.c,v 1.86 2004/01/14 17:45:36 jsalmon3 Exp $
 
 //@{
 
@@ -600,9 +600,9 @@
 
 #ifdef USE_SDL_SURFACE
 /**
-**             Color cycle.
+**  Color cycle.
 **
-**             FIXME: Also icons and some units use color cycling.
+**  FIXME: Also icons and some units use color cycling.
 */
 // FIXME: cpu intensive to go through the whole PaletteList
 global void ColorCycle(void)
@@ -644,7 +644,7 @@
                }
        } else {
                //
-               //              Color cycle tileset palette
+               //  Color cycle tileset palette
                //
                palcolors = 
TheMap.TileGraphic->Surface->format->palette->colors;
 
@@ -666,7 +666,6 @@
                        colors, 0, 256);
        }
 
-       MapColorCycle();                                // FIXME: could be 
little more informative
        MustRedraw |= RedrawColorCycle;
 }
 #else




reply via email to

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