stratagus-cvs
[Top][All Lists]
Advanced

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

[Stratagus-CVS] stratagus/src/editor editloop.c


From: address@hidden
Subject: [Stratagus-CVS] stratagus/src/editor editloop.c
Date: 15 Jan 2004 13:04:15 +1100

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

Modified files:
        src/editor     : editloop.c 

Log message:
        USE_SDL_SURFACE is default

Patches:
Index: stratagus/src/editor/editloop.c
diff -u stratagus/src/editor/editloop.c:1.154 
stratagus/src/editor/editloop.c:1.155
--- stratagus/src/editor/editloop.c:1.154       Thu Jan 15 09:31:03 2004
+++ stratagus/src/editor/editloop.c     Thu Jan 15 13:04:14 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: editloop.c,v 1.154 2004/01/14 22:31:03 nobody_ Exp $
+//      $Id: editloop.c,v 1.155 2004/01/15 02:04:14 jsalmon3 Exp $
 
 //@{
 
@@ -417,9 +417,6 @@
 */
 local void DrawTileIcons(void)
 {
-#ifndef USE_SDL_SURFACE
-       unsigned char** tiles;
-#endif
        int x;
        int y;
        int i;
@@ -458,10 +455,6 @@
                MBUTTON_GEM_SQUARE + (TileToolDecoration ? 2 : 0), x + 40, y - 
3);
        y += 20;
 
-#ifndef USE_SDL_SURFACE
-       tiles = TheMap.Tiles;
-#endif
-
        y = TheUI.ButtonPanelY + 4;
        i = 0;
 
@@ -475,11 +468,7 @@
 #ifdef USE_OPENGL
                        MapDrawTile(TheMap.Tileset->Table[0x10 + i * 16], x, y);
 #else
-#ifdef USE_SDL_SURFACE
                        VideoDrawTile(TheMap.Tileset->Table[0x10 + i * 16], x, 
y);
-#else
-                       VideoDrawTile(tiles[TheMap.Tileset->Table[0x10 + i * 
16]], x, y);
-#endif
 #endif
                        VideoDrawRectangle(ColorGray, x, y, TileSizeX, 
TileSizeY);
                        if (TileCursor == i) {
@@ -673,11 +662,7 @@
 */
 local void DrawTileIcon(unsigned tilenum,unsigned x,unsigned y,unsigned flags)
 {
-#ifdef USE_SDL_SURFACE
        Uint32 color;
-#else
-       VMemType color;
-#endif
 
        color = (flags & IconActive) ? ColorGray : ColorBlack;
 
@@ -705,11 +690,7 @@
 #ifdef USE_OPENGL
        MapDrawTile(TheMap.Tileset->Table[tilenum], x, y);
 #else
-#ifdef USE_SDL_SURFACE
        VideoDrawTile(TheMap.Tileset->Table[tilenum], x, y);
-#else
-       VideoDrawTile(TheMap.Tiles[TheMap.Tileset->Table[tilenum]], x, y);
-#endif
 #endif
 
        if (flags & IconSelected) {
@@ -800,13 +781,8 @@
 #ifdef USE_OPENGL
                                        MapDrawTile(TheMap.Tileset->Table[0x10 
+ TileCursor * 16], tx, ty);
 #else
-#ifdef USE_SDL_SURFACE
                                        
VideoDrawTile(TheMap.Tileset->Table[0x10 +
                                                TileCursor * 16], tx, ty);
-#else
-                                       
VideoDrawTile(TheMap.Tiles[TheMap.Tileset->Table[0x10 +
-                                               TileCursor * 16]], tx, ty);
-#endif
 #endif
                                }
                        }
@@ -920,10 +896,6 @@
 {
        int i;
 
-#ifndef USE_SDL_SURFACE
-       VideoLockScreen(); // { prepare video write
-#endif
-
        HideAnyCursor(); // remove cursor (when available)
 
        DrawMapArea(); // draw the map area
@@ -1014,10 +986,6 @@
 
        DrawAnyCursor();
 
-#ifdef USE_SDL_SURFACE
-       VideoUnlockScreen();                            // } end write access
-#endif
-
        // FIXME: For now update everything each frame
 
        // refresh entire screen, so no further invalidate needed
@@ -2118,13 +2086,7 @@
                InterfaceState = IfaceStateMenu;
                GameCursor = TheUI.Point.Cursor;
 
-#ifdef USE_SDL_SURFACE
-               VideoClearScreen();
-#else
-               VideoLockScreen();
                VideoClearScreen();
-               VideoUnlockScreen();
-#endif
                Invalidate();
        } while (EditorMapLoaded);
 




reply via email to

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