[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/map minimap.c
From: |
Nehal Mistry |
Subject: |
[Stratagus-CVS] stratagus/src/map minimap.c |
Date: |
Thu, 27 Nov 2003 22:40:01 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Nehal Mistry <address@hidden> 03/11/27 22:40:01
Modified files:
src/map : minimap.c
Log message:
UpdateMinimapTerrain updates palettes too
Patches:
Index: stratagus/src/map/minimap.c
diff -u stratagus/src/map/minimap.c:1.79 stratagus/src/map/minimap.c:1.80
--- stratagus/src/map/minimap.c:1.79 Thu Nov 27 20:21:36 2003
+++ stratagus/src/map/minimap.c Thu Nov 27 22:40:01 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: minimap.c,v 1.79 2003/11/28 01:21:36 nehalmistry Exp $
+// $Id: minimap.c,v 1.80 2003/11/28 03:40:01 nehalmistry Exp $
//@{
@@ -128,15 +128,11 @@
Map2MinimapY[n] = (n * MinimapScaleY) / MINIMAP_FAC;
}
+ // Palette updated from UpdateMinimapTerrain()
MinimapTerrainSurface = SDL_CreateRGBSurface(SDL_SWSURFACE,
TheUI.MinimapW,
TheUI.MinimapH, 8, 0, 0, 0, 0);
- SDL_SetPalette(MinimapTerrainSurface, SDL_LOGPAL,
- TheMap.TileGraphic->Surface->format->palette->colors, 0, 256);
-
MinimapSurface = SDL_CreateRGBSurface(SDL_SWSURFACE, TheUI.MinimapW,
TheUI.MinimapH, 8, 0, 0, 0, 0);
- SDL_SetPalette(MinimapSurface, SDL_LOGPAL,
- TheMap.TileGraphic->Surface->format->palette->colors, 0, 256);
srect.x = TheUI.MinimapPosX - TheUI.MinimapPanelX;
srect.y = TheUI.MinimapPosY - TheUI.MinimapPanelY;
@@ -177,6 +173,11 @@
scaley = 1;
}
+ SDL_SetPalette(MinimapTerrainSurface, SDL_LOGPAL,
+ TheMap.TileGraphic->Surface->format->palette->colors, 0, 256);
+ SDL_SetPalette(MinimapSurface, SDL_LOGPAL,
+ TheMap.TileGraphic->Surface->format->palette->colors, 0, 256);
+
tilepitch = TheMap.TileGraphic->Surface->w / TileSizeX;
SDL_LockSurface(MinimapTerrainSurface);
@@ -259,13 +260,10 @@
xofs = TileSizeX * (tile % tilepitch);
yofs = TileSizeY * (tile / tilepitch);
- // FIXME: does this work?
((Uint8*)MinimapTerrainSurface->pixels)[mx + my * TheUI.MinimapW] =
((Uint8*)TheMap.TileGraphic->Surface->pixels)
[xofs + 7 + (mx % scalex) * 8 + (yofs + 6 + (my % scaley) *
8)
* TheMap.TileGraphic->Surface->w];
-// ((unsigned char*)MinimapTerrainGraphic->Frames)[mx + my *
TheUI.MinimapW] =
-// TheMap.Tiles[tile][7 + (mx % scalex) * 8 + (6 + (my % scaley) *
8) * TileSizeX];
}
}
SDL_UnlockSurface(TheMap.TileGraphic->Surface);