[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src clone/clone.c video/cursor.c vide...
|
From: |
Jimmy Salmon |
|
Subject: |
[Stratagus-CVS] stratagus/src clone/clone.c video/cursor.c vide... |
|
Date: |
Sun, 23 Nov 2003 14:11:04 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/11/23 14:11:04
Modified files:
src/clone : clone.c
src/video : cursor.c linedraw.c png.c video.c
Log message:
Fixed compiling errors
Patches:
Index: stratagus/src/clone/clone.c
diff -u stratagus/src/clone/clone.c:1.228 stratagus/src/clone/clone.c:1.229
--- stratagus/src/clone/clone.c:1.228 Thu Nov 20 02:59:43 2003
+++ stratagus/src/clone/clone.c Sun Nov 23 14:11:02 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: clone.c,v 1.228 2003/11/20 07:59:43 nehalmistry Exp $
+// $Id: clone.c,v 1.229 2003/11/23 19:11:02 jsalmon3 Exp $
//@{
@@ -1004,7 +1004,9 @@
va_end(va);
if (VideoDepth && IsFontLoaded(GameFont)) {
-#ifndef USE_SDL_SURFACE
+#ifdef USE_SDL_SURFACE
+ SDL_Color color = { 0, 0, 0, 0 };
+#else
VideoLockScreen();
#endif
for (s = temp; *s; ++s) { // Remove non printable chars
@@ -1013,8 +1015,6 @@
}
}
#ifdef USE_SDL_SURFACE
- SDL_Color color = { 0, 0, 0, 0 };
-
VideoFillRectangle(color, 5, VideoHeight - 18, VideoWidth - 10, 18);
#else
VideoFillRectangle(ColorBlack, 5, VideoHeight - 18, VideoWidth - 10,
18);
Index: stratagus/src/video/cursor.c
diff -u stratagus/src/video/cursor.c:1.80 stratagus/src/video/cursor.c:1.81
--- stratagus/src/video/cursor.c:1.80 Mon Nov 17 17:07:36 2003
+++ stratagus/src/video/cursor.c Sun Nov 23 14:11:03 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: cursor.c,v 1.80 2003/11/17 22:07:36 nehalmistry Exp $
+// $Id: cursor.c,v 1.81 2003/11/23 19:11:03 jsalmon3 Exp $
//@{
@@ -124,7 +124,7 @@
local int HiddenCursorW; /// saved cursor width in pixel
local int HiddenCursorH; /// saved cursor height in pixel
- /// Memory re-use, so can be defined although no save present!
+ /// Memory re-use, so can be defined although no save present!
local int OldCursorSize; /// size of saved cursor image
#ifdef USE_SDL_SURFACE
local SDL_Surface* OldCursorImage; /// background saved behind
cursor
@@ -730,7 +730,11 @@
global void DestroyCursorBackground(void)
{
if (OldCursorImage) {
+#ifdef USE_SDL_SURFACE
+ SDL_FreeSurface(OldCursorImage);
+#else
free(OldCursorImage);
+#endif
OldCursorImage = NULL;
}
OldCursorSize = 0;
@@ -966,36 +970,36 @@
// First, Normal cursor (might restore part of rectangle cursor also).
//
if (OldCursorW && OldCursorImage) {
- // restore area of visible cursor
- LoadCursorBackground(OldCursorX, OldCursorY, OldCursorW, OldCursorH);
+ // restore area of visible cursor
+ LoadCursorBackground(OldCursorX, OldCursorY, OldCursorW, OldCursorH);
- // save hidden area to be invalidated
- HiddenCursorX = OldCursorX;
- HiddenCursorY = OldCursorY;
- HiddenCursorW = OldCursorW;
- HiddenCursorH = OldCursorH;
+ // save hidden area to be invalidated
+ HiddenCursorX = OldCursorX;
+ HiddenCursorY = OldCursorY;
+ HiddenCursorW = OldCursorW;
+ HiddenCursorH = OldCursorH;
- // Denote cursor no longer visible
- OldCursorW = 0;
+ // Denote cursor no longer visible
+ OldCursorW = 0;
}
//
// Last, Selecting rectangle
//
if (OldCursorRectangleW) {
- // restore area of visible cursor
+ // restore area of visible cursor
LoadCursorRectangle(OldCursorRectangle,
OldCursorRectangleX, OldCursorRectangleY,
OldCursorRectangleW, OldCursorRectangleH);
- // save hidden area to be invalidated
- HiddenCursorRectangleX = OldCursorRectangleX;
- HiddenCursorRectangleY = OldCursorRectangleY;
- HiddenCursorRectangleW = OldCursorRectangleW;
- HiddenCursorRectangleH = OldCursorRectangleH;
+ // save hidden area to be invalidated
+ HiddenCursorRectangleX = OldCursorRectangleX;
+ HiddenCursorRectangleY = OldCursorRectangleY;
+ HiddenCursorRectangleW = OldCursorRectangleW;
+ HiddenCursorRectangleH = OldCursorRectangleH;
- // Denote cursor no longer visible
- OldCursorRectangleW = 0;
+ // Denote cursor no longer visible
+ OldCursorRectangleW = 0;
} else if (BuildingCursor) {
//
// Or Selecting position for building
@@ -1003,7 +1007,7 @@
//NOTE: this will restore tiles themselves later in next video update
MarkDrawAreaMap(BuildingCursorSX, BuildingCursorSY,
BuildingCursorEX, BuildingCursorEY);
- BuildingCursor = 0;
+ BuildingCursor = 0;
}
}
@@ -1246,7 +1250,7 @@
int i;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: cursors $Id: cursor.c,v 1.80 2003/11/17
22:07:36 nehalmistry Exp $\n\n");
+ CLprintf(file, ";;; MODULE: cursors $Id: cursor.c,v 1.81 2003/11/23
19:11:03 jsalmon3 Exp $\n\n");
for (i = 0; Cursors[i].OType; ++i) {
CLprintf(file, "(define-cursor '%s '%s\n",
Index: stratagus/src/video/linedraw.c
diff -u stratagus/src/video/linedraw.c:1.49 stratagus/src/video/linedraw.c:1.50
--- stratagus/src/video/linedraw.c:1.49 Sat Nov 22 02:34:36 2003
+++ stratagus/src/video/linedraw.c Sun Nov 23 14:11:03 2003
@@ -10,7 +10,7 @@
//
/address@hidden linedraw.c - The general linedraw functions. */
//
-// (c) Copyright 2000-2003 by Lutz Sammer, Stephan Rasenberg,
+// (c) Copyright 2000-2003 by Lutz Sammer, Stephan Rasenberg,
// Jimmy Salmon, Nehal Mistry
//
// This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: linedraw.c,v 1.49 2003/11/22 07:34:36 nehalmistry Exp $
+// $Id: linedraw.c,v 1.50 2003/11/23 19:11:03 jsalmon3 Exp $
//@{
@@ -464,7 +464,7 @@
ofs = TheScreen->pitch * y + x * bpp;
SDL_LockSurface(TheScreen);
- memcpy(TheScreen->pixels + ofs, &c, bpp);
+ memcpy((char*)TheScreen->pixels + ofs, &c, bpp);
SDL_UnlockSurface(TheScreen);
}
@@ -481,7 +481,7 @@
ofs = TheScreen->pitch * y + x * bpp;
SDL_LockSurface(TheScreen);
- memcpy(TheScreen->pixels + ofs, &c, bpp);
+ memcpy((char*)TheScreen->pixels + ofs, &c, bpp);
SDL_UnlockSurface(TheScreen);
}
@@ -762,7 +762,7 @@
SDL_Surface* s;
Uint32 c;
- s = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h,
+ s = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h,
32, RMASK, GMASK, BMASK, AMASK);
c = SDL_MapRGBA(s->format, color.r, color.g, color.b, alpha);
@@ -1437,7 +1437,7 @@
** @param alpha alpha value of pixel.
**
** For 15bit |-RRRRRGGGGGBBBBB|, we need for each 5bit offically:
-** (5bit - 5bit) * 8bit alpha = 14bit signed int
+** (5bit - 5bit) * 8bit alpha = 14bit signed int
**
** But Lutz has a smarter way, all in one unsigned 32bit:
** color = |------GGGGG-----RRRRR------BBBBB|
@@ -1471,8 +1471,8 @@
** @param alpha alpha value of pixel.
**
** For 16bit |RRRRRGGGGGGBBBBB|, we need offically:
-** (5bit - 5bit) * 8bit alpha = 14bit signed int
-** (6bit - 6bit) * 8bit alpha = 15bit signed int
+** (5bit - 5bit) * 8bit alpha = 14bit signed int
+** (6bit - 6bit) * 8bit alpha = 15bit signed int
**
** But Lutz has a smarter way, all in one unsigned 32bit:
** color = |-----GGGGGG-----RRRRR------BBBBB|
@@ -1521,7 +1521,7 @@
** @param alpha alpha value of pixel.
**
** For 32bit |AAAAAAAARRRRRRRRGGGGGGGGBBBBBBBB|, we need offically:
-** (8bit - 8bit) * 8bit alpha = 17bit signed int
+** (8bit - 8bit) * 8bit alpha = 17bit signed int
**
** a smarter way, all in two unsigned 32bit:
** color(1) = |--------RRRRRRRR--------BBBBBBBB|
@@ -2018,16 +2018,16 @@
sp1 = (sp1 & 0x00FF00FF) * 3;
while (p < e) {
- unsigned long dp1;
+ unsigned long dp1;
unsigned long dp2;
- dp1 = *p;
- dp2 = (dp1 & 0xFF00FF00) >> 8;
- dp1 &= 0x00FF00FF;
-
- dp1 = ((dp1 + sp1) >> 2) & 0x00FF00FF;
- dp2 = ((dp2 + sp2) >> 2) & 0x00FF00FF;
- *p++ = (dp1 | (dp2 << 8));
+ dp1 = *p;
+ dp2 = (dp1 & 0xFF00FF00) >> 8;
+ dp1 &= 0x00FF00FF;
+
+ dp1 = ((dp1 + sp1) >> 2) & 0x00FF00FF;
+ dp2 = ((dp2 + sp2) >> 2) & 0x00FF00FF;
+ *p++ = (dp1 | (dp2 << 8));
}
}
@@ -2183,15 +2183,15 @@
sp1 &= 0x00FF00FF;
while (p < e) {
- unsigned long dp1, dp2;
+ unsigned long dp1, dp2;
- dp1 = *p;
- dp2 = (dp1 & 0xFF00FF00) >> 8;
- dp1 &= 0x00FF00FF;
-
- dp1 = ((dp1 + sp1) >> 1) & 0x00FF00FF;
- dp2 = ((dp2 + sp2) >> 1) & 0x00FF00FF;
- *p++ = (dp1 | (dp2 << 8));
+ dp1 = *p;
+ dp2 = (dp1 & 0xFF00FF00) >> 8;
+ dp1 &= 0x00FF00FF;
+
+ dp1 = ((dp1 + sp1) >> 1) & 0x00FF00FF;
+ dp2 = ((dp2 + sp2) >> 1) & 0x00FF00FF;
+ *p++ = (dp1 | (dp2 << 8));
}
}
@@ -2244,8 +2244,8 @@
c = color.D8;
while (p < e) {
- *p = lookup25trans8[(*p << 8) | c];
- ++p;
+ *p = lookup25trans8[(*p << 8) | c];
+ ++p;
}
}
@@ -2349,16 +2349,16 @@
sp1 &= 0x00FF00FF;
while (p < e) {
- unsigned long dp1;
+ unsigned long dp1;
unsigned long dp2;
- dp1 = *p;
- dp2 = (dp1 & 0xFF00FF00) >> 8;
- dp1 &= 0x00FF00FF;
-
- dp1 = (((dp1 << 1) + dp1 + sp1) >> 2) & 0x00FF00FF;
- dp2 = (((dp2 << 1) + dp2 + sp2) >> 2) & 0x00FF00FF;
- *p++ = (dp1 | (dp2 << 8));
+ dp1 = *p;
+ dp2 = (dp1 & 0xFF00FF00) >> 8;
+ dp1 &= 0x00FF00FF;
+
+ dp1 = (((dp1 << 1) + dp1 + sp1) >> 2) & 0x00FF00FF;
+ dp2 = (((dp2 << 1) + dp2 + sp2) >> 2) & 0x00FF00FF;
+ *p++ = (dp1 | (dp2 << 8));
}
}
@@ -2557,17 +2557,17 @@
c = *p;
- i = c.a;
- i = (((i - spR) * alpha) >> 8) + spR;
- c.a = i & 0xFF;
-
- i = c.b;
- i = (((i - spG) * alpha) >> 8) + spG;
- c.b = i & 0xFF;
-
- i = c.c;
- i = (((i - spB) * alpha) >> 8) + spB;
- c.c = i & 0xFF;
+ i = c.a;
+ i = (((i - spR) * alpha) >> 8) + spR;
+ c.a = i & 0xFF;
+
+ i = c.b;
+ i = (((i - spG) * alpha) >> 8) + spG;
+ c.b = i & 0xFF;
+
+ i = c.c;
+ i = (((i - spB) * alpha) >> 8) + spB;
+ c.c = i & 0xFF;
*p++ = c;
}
@@ -2606,9 +2606,9 @@
dp2 = (dp1 & 0xFF00FF00) >> 8;
dp1 &= 0x00FF00FF;
- //FIXME: alpha==256 unreached
- dp1 = ((((dp1 - sp1) * alpha) >> 7) + sp1) & 0x00FF00FF;
- dp2 = ((((dp2 - sp2) * alpha) >> 7) + sp2) & 0x00FF00FF;
+ //FIXME: alpha==256 unreached
+ dp1 = ((((dp1 - sp1) * alpha) >> 7) + sp1) & 0x00FF00FF;
+ dp2 = ((((dp2 - sp2) * alpha) >> 7) + sp2) & 0x00FF00FF;
*p++ = (dp1 | (dp2 << 8));
}
@@ -2889,8 +2889,8 @@
p = VideoMemory8 + x + y * w;
c = color.D8 << 8;
while (height--) {
- *p = lookup25trans8[c | *p];
- p += w;
+ *p = lookup25trans8[c | *p];
+ p += w;
}
}
@@ -2919,9 +2919,9 @@
dp = *p;
dp = ((dp << 16) | dp) & 0x03E07C1F;
- dp = ((dp + sp) >> 2) & 0x03E07C1F;
+ dp = ((dp + sp) >> 2) & 0x03E07C1F;
*p = (dp >> 16) | dp;
- p += w;
+ p += w;
}
}
@@ -2950,9 +2950,9 @@
dp = *p;
dp = ((dp << 16) | dp) & 0x07E0F81F;
- dp = ((dp + sp) >> 2) & 0x07E0F81F;
+ dp = ((dp + sp) >> 2) & 0x07E0F81F;
*p = (dp >> 16) | dp;
- p += w;
+ p += w;
}
}
@@ -2995,14 +2995,14 @@
unsigned long dp1, dp2;
dp1 = *p;
- dp2 = (dp1 & 0xFF00FF00) >> 8;
- dp1 &= 0x00FF00FF;
+ dp2 = (dp1 & 0xFF00FF00) >> 8;
+ dp1 &= 0x00FF00FF;
- dp1 = ((dp1 + sp1) >> 2) & 0x00FF00FF;
- dp2 = ((dp2 + sp2) >> 2) & 0x00FF00FF;
- *p = (dp1 | (dp2 << 8));
+ dp1 = ((dp1 + sp1) >> 2) & 0x00FF00FF;
+ dp2 = ((dp2 + sp2) >> 2) & 0x00FF00FF;
+ *p = (dp1 | (dp2 << 8));
- p += w;
+ p += w;
}
}
@@ -3052,8 +3052,8 @@
p = VideoMemory8 + x + y * w;
c = color.D8 << 8;
while (height--) {
- *p = lookup50trans8[c | *p];
- p += w;
+ *p = lookup50trans8[c | *p];
+ p += w;
}
}
@@ -3081,9 +3081,9 @@
dp = *p;
dp = ((dp << 16) | dp) & 0x03E07C1F;
- dp = ((dp + sp) >> 1) & 0x03E07C1F;
+ dp = ((dp + sp) >> 1) & 0x03E07C1F;
*p = (dp >> 16) | dp;
- p += w;
+ p += w;
}
}
@@ -3112,9 +3112,9 @@
dp = *p;
dp = ((dp << 16) | dp) & 0x07E0F81F;
- dp = ((dp + sp) >> 1) & 0x07E0F81F;
+ dp = ((dp + sp) >> 1) & 0x07E0F81F;
*p = (dp >> 16) | dp;
- p += w;
+ p += w;
}
}
@@ -3158,14 +3158,14 @@
unsigned long dp2;
dp1 = *p;
- dp2 = (dp1 & 0xFF00FF00) >> 8;
- dp1 &= 0x00FF00FF;
+ dp2 = (dp1 & 0xFF00FF00) >> 8;
+ dp1 &= 0x00FF00FF;
- dp1 = ((dp1 + sp1) >> 1) & 0x00FF00FF;
- dp2 = ((dp2 + sp2) >> 1) & 0x00FF00FF;
- *p = (dp1 | (dp2 << 8));
+ dp1 = ((dp1 + sp1) >> 1) & 0x00FF00FF;
+ dp2 = ((dp2 + sp2) >> 1) & 0x00FF00FF;
+ *p = (dp1 | (dp2 << 8));
- p += w;
+ p += w;
}
}
@@ -3217,8 +3217,8 @@
p = VideoMemory8 + x + y * w;
c = color.D8;
while (height--) {
- *p = lookup25trans8[(*p << 8) | c];
- p += w;
+ *p = lookup25trans8[(*p << 8) | c];
+ p += w;
}
}
@@ -3247,9 +3247,9 @@
dp = *p;
dp = ((dp << 16) | dp) & 0x03E07C1F;
- dp = (((dp << 1) + dp + sp) >> 2) & 0x03E07C1F;
+ dp = (((dp << 1) + dp + sp) >> 2) & 0x03E07C1F;
*p = (dp >> 16) | dp;
- p += w;
+ p += w;
}
}
@@ -3278,9 +3278,9 @@
dp = *p;
dp = ((dp << 16) | dp) & 0x07E0F81F;
- dp = (((dp << 1) + dp + sp) >> 2) & 0x07E0F81F;
+ dp = (((dp << 1) + dp + sp) >> 2) & 0x07E0F81F;
*p = (dp >> 16) | dp;
- p += w;
+ p += w;
}
}
@@ -3324,14 +3324,14 @@
unsigned long dp2;
dp1 = *p;
- dp2 = (dp1 & 0xFF00FF00) >> 8;
- dp1 &= 0x00FF00FF;
+ dp2 = (dp1 & 0xFF00FF00) >> 8;
+ dp1 &= 0x00FF00FF;
- dp1 = (((dp1 << 1) + dp1 + sp1) >> 2) & 0x00FF00FF;
- dp2 = (((dp2 << 1) + dp2 + sp2) >> 2) & 0x00FF00FF;
- *p = (dp1 | (dp2 << 8));
+ dp1 = (((dp1 << 1) + dp1 + sp1) >> 2) & 0x00FF00FF;
+ dp2 = (((dp2 << 1) + dp2 + sp2) >> 2) & 0x00FF00FF;
+ *p = (dp1 | (dp2 << 8));
- p += w;
+ p += w;
}
}
@@ -3462,7 +3462,7 @@
dp = ((dp << 16) | dp) & 0x03E07C1F;
dp = ((((dp - sp) * alpha) >> 5) + sp) & 0x03E07C1F; //FIXME:
alpha==256 unreached
*p = (dp >> 16) | dp;
- p += w;
+ p += w;
}
}
@@ -3496,7 +3496,7 @@
dp = ((dp << 16) | dp) & 0x07E0F81F;
dp = ((((dp - sp) * alpha) >> 5) + sp) & 0x07E0F81F; //FIXME:
alpha==256 unreached
*p = (dp >> 16) | dp;
- p += w;
+ p += w;
}
}
@@ -3544,15 +3544,15 @@
unsigned long dp2;
dp1 = *p;
- dp2 = (dp1 & 0xFF00FF00) >> 8;
- dp1 &= 0x00FF00FF;
+ dp2 = (dp1 & 0xFF00FF00) >> 8;
+ dp1 &= 0x00FF00FF;
- //FIXME: alpha==256 unreached
- dp1 = ((((dp1-sp1) * alpha) >> 8) + sp1) & 0x00FF00FF;
- dp2 = ((((dp2-sp2) * alpha) >> 8) + sp2) & 0x00FF00FF;
- *p = (dp1 | (dp2 << 8));
+ //FIXME: alpha==256 unreached
+ dp1 = ((((dp1-sp1) * alpha) >> 8) + sp1) & 0x00FF00FF;
+ dp2 = ((((dp2-sp2) * alpha) >> 8) + sp2) & 0x00FF00FF;
+ *p = (dp1 | (dp2 << 8));
- p += w;
+ p += w;
}
}
@@ -4225,7 +4225,7 @@
//FIXME: As the clipped coordinates are rounded to integers, the line's
// direction vector might be slightly off. Somehow, the sub-pixel
// position(s) on the clipped retangle should be denoted to the line
-// drawing routine..
+// drawing routine..
DebugCheck(x1 < ClipX1 || x2 < ClipX1 || x1 > ClipX2 || x2 > ClipX2 ||
y1 < ClipY1 || y2 < ClipY1 || y1 > ClipY2 || y2 > ClipY2);
VideoDrawLine(color, x1, y1, x2, y2);
@@ -7291,64 +7291,64 @@
#else
switch (VideoBpp) {
case 8:
- if (lookup25trans8 && lookup50trans8) {
- VideoDrawPixel = DrawPixel8;
- VideoDraw25TransPixel = Draw25TransPixel8;
- VideoDraw50TransPixel = Draw50TransPixel8;
- VideoDraw75TransPixel = Draw75TransPixel8;
- VideoDrawTransPixel = DrawTransPixel8;
- VideoDrawPixelClip = DrawPixelClip8;
- VideoDrawHLine = DrawHLine8;
- VideoDraw25TransHLine = Draw25TransHLine8;
- VideoDraw50TransHLine = Draw50TransHLine8;
- VideoDraw75TransHLine = Draw75TransHLine8;
- VideoDrawTransHLine = DrawTransHLine8;
- VideoDrawVLine = DrawVLine8;
- VideoDraw25TransVLine = Draw25TransVLine8;
- VideoDraw50TransVLine = Draw50TransVLine8;
- VideoDraw75TransVLine = Draw75TransVLine8;
- VideoDrawTransVLine = DrawTransVLine8;
- VideoDrawLine = DrawLine8;
- VideoDrawRectangle = DrawRectangle8;
- VideoDraw25TransRectangle = Draw25TransRectangle8;
- VideoDraw50TransRectangle = Draw50TransRectangle8;
- VideoDraw75TransRectangle = Draw75TransRectangle8;
- VideoDrawTransRectangle = DrawTransRectangle8;
- VideoFillRectangle = DrawFillRectangle8;
- VideoFill25TransRectangle = DrawFill25TransRectangle8;
- VideoFill50TransRectangle = DrawFill50TransRectangle8;
- VideoFill75TransRectangle = DrawFill75TransRectangle8;
- VideoFillTransRectangle = DrawFillTransRectangle8;
- } else {
- printf("(transparency support disabled)\n");
- VideoDrawPixel =
- VideoDraw25TransPixel =
- VideoDraw50TransPixel =
- VideoDraw75TransPixel = DrawPixel8;
- VideoDrawTransPixel = DrawNoTransPixel8;
- VideoDrawPixelClip = DrawPixelClip8;
- VideoDrawHLine =
- VideoDraw25TransHLine =
- VideoDraw50TransHLine =
- VideoDraw75TransHLine = DrawHLine8;
- VideoDrawTransHLine = DrawNoTransHLine8;
- VideoDrawVLine =
- VideoDraw25TransVLine =
- VideoDraw50TransVLine =
- VideoDraw75TransVLine = DrawVLine8;
- VideoDrawTransVLine = DrawNoTransVLine8;
- VideoDrawLine = DrawLine8;
- VideoDrawRectangle =
- VideoDraw25TransRectangle =
- VideoDraw50TransRectangle =
- VideoDraw75TransRectangle = DrawRectangle8;
- VideoDrawTransRectangle = DrawNoTransRectangle8;
- VideoFillRectangle =
- VideoFill25TransRectangle =
- VideoFill50TransRectangle =
- VideoFill75TransRectangle = DrawFillRectangle8;
- VideoFillTransRectangle = DrawFillNoTransRectangle8;
- }
+ if (lookup25trans8 && lookup50trans8) {
+ VideoDrawPixel = DrawPixel8;
+ VideoDraw25TransPixel = Draw25TransPixel8;
+ VideoDraw50TransPixel = Draw50TransPixel8;
+ VideoDraw75TransPixel = Draw75TransPixel8;
+ VideoDrawTransPixel = DrawTransPixel8;
+ VideoDrawPixelClip = DrawPixelClip8;
+ VideoDrawHLine = DrawHLine8;
+ VideoDraw25TransHLine = Draw25TransHLine8;
+ VideoDraw50TransHLine = Draw50TransHLine8;
+ VideoDraw75TransHLine = Draw75TransHLine8;
+ VideoDrawTransHLine = DrawTransHLine8;
+ VideoDrawVLine = DrawVLine8;
+ VideoDraw25TransVLine = Draw25TransVLine8;
+ VideoDraw50TransVLine = Draw50TransVLine8;
+ VideoDraw75TransVLine = Draw75TransVLine8;
+ VideoDrawTransVLine = DrawTransVLine8;
+ VideoDrawLine = DrawLine8;
+ VideoDrawRectangle = DrawRectangle8;
+ VideoDraw25TransRectangle = Draw25TransRectangle8;
+ VideoDraw50TransRectangle = Draw50TransRectangle8;
+ VideoDraw75TransRectangle = Draw75TransRectangle8;
+ VideoDrawTransRectangle = DrawTransRectangle8;
+ VideoFillRectangle = DrawFillRectangle8;
+ VideoFill25TransRectangle = DrawFill25TransRectangle8;
+ VideoFill50TransRectangle = DrawFill50TransRectangle8;
+ VideoFill75TransRectangle = DrawFill75TransRectangle8;
+ VideoFillTransRectangle = DrawFillTransRectangle8;
+ } else {
+ printf("(transparency support disabled)\n");
+ VideoDrawPixel =
+ VideoDraw25TransPixel =
+ VideoDraw50TransPixel =
+ VideoDraw75TransPixel = DrawPixel8;
+ VideoDrawTransPixel = DrawNoTransPixel8;
+ VideoDrawPixelClip = DrawPixelClip8;
+ VideoDrawHLine =
+ VideoDraw25TransHLine =
+ VideoDraw50TransHLine =
+ VideoDraw75TransHLine = DrawHLine8;
+ VideoDrawTransHLine = DrawNoTransHLine8;
+ VideoDrawVLine =
+ VideoDraw25TransVLine =
+ VideoDraw50TransVLine =
+ VideoDraw75TransVLine = DrawVLine8;
+ VideoDrawTransVLine = DrawNoTransVLine8;
+ VideoDrawLine = DrawLine8;
+ VideoDrawRectangle =
+ VideoDraw25TransRectangle =
+ VideoDraw50TransRectangle =
+ VideoDraw75TransRectangle = DrawRectangle8;
+ VideoDrawTransRectangle = DrawNoTransRectangle8;
+ VideoFillRectangle =
+ VideoFill25TransRectangle =
+ VideoFill50TransRectangle =
+ VideoFill75TransRectangle = DrawFillRectangle8;
+ VideoFillTransRectangle = DrawFillNoTransRectangle8;
+ }
break;
case 15:
Index: stratagus/src/video/png.c
diff -u stratagus/src/video/png.c:1.28 stratagus/src/video/png.c:1.29
--- stratagus/src/video/png.c:1.28 Fri Nov 21 22:00:23 2003
+++ stratagus/src/video/png.c Sun Nov 23 14:11:03 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: png.c,v 1.28 2003/11/22 03:00:23 nehalmistry Exp $
+// $Id: png.c,v 1.29 2003/11/23 19:11:03 jsalmon3 Exp $
//@{
@@ -83,8 +83,6 @@
#ifdef USE_SDL_SURFACE
// SDL_Palette* palette;
SDL_Color* palettecolors;
-int ckey;
- ckey = -1;
#else
Palette* palette;
#endif
@@ -330,7 +328,7 @@
Uint8 c;
for (j = 0; j < VideoWidth; ++j) {
c = ((Uint8*)TheScreen->pixels)[j * bpp + i * VideoWidth *
3];
- memcpy(row, TheScreen->pixels + i * VideoWidth, VideoWidth
* 3);
+ memcpy(row, (char*)TheScreen->pixels + i * VideoWidth,
VideoWidth * 3);
}
break;
}
Index: stratagus/src/video/video.c
diff -u stratagus/src/video/video.c:1.72 stratagus/src/video/video.c:1.73
--- stratagus/src/video/video.c:1.72 Thu Nov 20 02:59:45 2003
+++ stratagus/src/video/video.c Sun Nov 23 14:11:03 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: video.c,v 1.72 2003/11/20 07:59:45 nehalmistry Exp $
+// $Id: video.c,v 1.73 2003/11/23 19:11:03 jsalmon3 Exp $
//@{
@@ -258,7 +258,7 @@
// FIXME: docu
global SDL_Color* lookup50trans8;
// FIXME: docu
-global void VideoAllocPalette(SDL_Palette* palette, SDL_Palette*
+global void VideoAllocPalette(SDL_Palette* palette, SDL_Palette*
syspalette);
#else
global Palette* commonpalette;
@@ -589,6 +589,10 @@
global void DisplayPicture(const char* name)
{
Graphic* picture;
+#ifdef USE_SDL_SURFACE
+ SDL_Rect srect;
+ SDL_Rect drect;
+#endif
picture = LoadGraphic(name);
ResizeGraphic(picture, VideoWidth, VideoHeight);
@@ -597,9 +601,6 @@
#endif
#ifdef USE_SDL_SURFACE
- SDL_Rect srect;
- SDL_Rect drect;
-
srect.x = 0;
srect.y = 0;
srect.w = picture->Width;
@@ -1503,7 +1504,7 @@
case 16: ColorCycle = ColorCycle16; break;
case 24: ColorCycle = ColorCycle24; break;
case 32: ColorCycle = ColorCycle32; break;
- default: DebugLevel0Fn("Video %d bpp unsupported\n" _C_ VideoBpp);
+ default: DebugLevel0Fn("Video %d bpp unsupported\n" _C_ VideoBpp);
}
VideoTypeSize = VideoBpp / 8;
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src clone/clone.c video/cursor.c vide...,
Jimmy Salmon <=