[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src clone/mainloop.c clone/unit.c clo...
|
From: |
Crestez Leonard |
|
Subject: |
[Stratagus-CVS] stratagus/src clone/mainloop.c clone/unit.c clo... |
|
Date: |
Wed, 29 Oct 2003 22:46:03 -0500 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Crestez Leonard <address@hidden> 03/10/29 22:46:03
Modified files:
src/clone : mainloop.c unit.c unit_draw.c
src/include : deco.h map.h stratagus.h
src/map : map_draw.c
src/ui : ccl_ui.c
src/video : deco.c sweepline.h video.c
Log message:
map works in NEW_DECODRAW... but that's about it :(
Patches:
Index: stratagus/src/clone/mainloop.c
diff -u stratagus/src/clone/mainloop.c:1.151
stratagus/src/clone/mainloop.c:1.152
--- stratagus/src/clone/mainloop.c:1.151 Sun Oct 26 14:43:51 2003
+++ stratagus/src/clone/mainloop.c Wed Oct 29 22:46:02 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: mainloop.c,v 1.151 2003/10/26 19:43:51 jsalmon3 Exp $
+// $Id: mainloop.c,v 1.152 2003/10/30 03:46:02 n0body Exp $
//@{
@@ -105,8 +105,12 @@
Viewport* vp;
vp = TheUI.SelectedViewport;
- if (vp->MapY > step) {
+ if (vp->MapY >= step) {
vp->MapY -= step;
+#ifdef NEW_DECODRAW
+ // Redraw the map deco.
+ DecorationMark(MapDecoration);
+#endif
} else {
vp->MapY = 0;
}
@@ -122,8 +126,12 @@
Viewport* vp;
vp = TheUI.SelectedViewport;
- if (vp->MapX > step) {
+ if (vp->MapX >= step) {
vp->MapX -= step;
+#ifdef NEW_DECODRAW
+ // Redraw the map deco.
+ DecorationMark(MapDecoration);
+#endif
} else {
vp->MapX = 0;
}
@@ -140,8 +148,12 @@
vp = TheUI.SelectedViewport;
if (TheMap.Height > vp->MapHeight &&
- vp->MapY < TheMap.Height - vp->MapHeight - step) {
+ vp->MapY <= TheMap.Height - vp->MapHeight - step) {
vp->MapY += step;
+#ifdef NEW_DECODRAW
+ // Redraw the map deco.
+ DecorationMark(MapDecoration);
+#endif
} else {
vp->MapY = TheMap.Height - vp->MapHeight;
}
@@ -158,8 +170,12 @@
vp = TheUI.SelectedViewport;
if (TheMap.Width > vp->MapWidth &&
- vp->MapX < TheMap.Width - vp->MapWidth - step) {
+ vp->MapX <= TheMap.Width - vp->MapWidth - step) {
vp->MapX += step;
+#ifdef NEW_DECODRAW
+ // Redraw the map deco.
+ DecorationMark(MapDecoration);
+#endif
} else {
vp->MapX = TheMap.Width - vp->MapWidth;
}
@@ -359,26 +375,26 @@
*/
local void DrawMapViewport(Viewport* vp)
{
- Unit* table[UnitMax];
- Missile* missiletable[MAX_MISSILES * 9];
- int nunits;
- int nmissiles;
- int i;
- int j;
- int x;
- int y;
-
#ifdef NEW_DECODRAW
// Experimental new drawing mechanism, which can keep track of what is
// overlapping and draw only that what has changed..
// Every to-be-drawn item added to this mechanism, can be handed by this
// call.
if (InterfaceState == IfaceStateNormal) {
- // DecorationRefreshDisplay();
+// DecorationRefreshDisplay();
DecorationUpdateDisplay();
}
#else
+ Unit* table[UnitMax];
+ Missile* missiletable[MAX_MISSILES * 9];
+ int nunits;
+ int nmissiles;
+ int i;
+ int j;
+ int x;
+ int y;
+
if (InterfaceState == IfaceStateNormal) {
#ifdef NEW_MAPDRAW
MapUpdateFogOfWar(vp->MapX, vp->MapY);
Index: stratagus/src/clone/unit.c
diff -u stratagus/src/clone/unit.c:1.323 stratagus/src/clone/unit.c:1.324
--- stratagus/src/clone/unit.c:1.323 Wed Oct 29 08:00:32 2003
+++ stratagus/src/clone/unit.c Wed Oct 29 22:46:02 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit.c,v 1.323 2003/10/29 13:00:32 mr-russ Exp $
+// $Id: unit.c,v 1.324 2003/10/30 03:46:02 n0body Exp $
//@{
@@ -1355,8 +1355,8 @@
// FIXME: Inaccurate dimension to take unit's extras into account..
// Should be solved by adding each unit extra as separate
decoration
- x = Map2ScreenX(unit->X) + unit->IX - 10;
- y = Map2ScreenY(unit->Y) + unit->IY - 10;
+ x = Map2ViewportX(TheUI.SelectedViewport, unit->X) + unit->IX - 10;
+ y = Map2ViewportY(TheUI.SelectedViewport, unit->Y) + unit->IY - 10;
w = unit->Type->Width + 20;
h = unit->Type->Height + 20;
@@ -3743,7 +3743,7 @@
int RunStart;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: units $Id: unit.c,v 1.323 2003/10/29 13:00:32
mr-russ Exp $\n\n");
+ CLprintf(file, ";;; MODULE: units $Id: unit.c,v 1.324 2003/10/30 03:46:02
n0body Exp $\n\n");
//
// Local variables
Index: stratagus/src/clone/unit_draw.c
diff -u stratagus/src/clone/unit_draw.c:1.174
stratagus/src/clone/unit_draw.c:1.175
--- stratagus/src/clone/unit_draw.c:1.174 Sat Oct 25 17:05:32 2003
+++ stratagus/src/clone/unit_draw.c Wed Oct 29 22:46:02 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit_draw.c,v 1.174 2003/10/25 21:05:32 n0body Exp $
+// $Id: unit_draw.c,v 1.175 2003/10/30 03:46:02 n0body Exp $
//@{
@@ -583,7 +583,7 @@
global void SaveDecorations(CLFile* file)
{
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: decorations $Id: unit_draw.c,v 1.174
2003/10/25 21:05:32 n0body Exp $\n\n");
+ CLprintf(file, ";;; MODULE: decorations $Id: unit_draw.c,v 1.175
2003/10/30 03:46:02 n0body Exp $\n\n");
CLprintf(file, "(mana-sprite \"%s\" %d %d %d %d)\n",
ManaSprite.File, ManaSprite.HotX, ManaSprite.HotY,
@@ -1867,6 +1867,11 @@
return;
}
+#ifdef NEW_DECODRAW
+ if (!CurrentViewport) {
+ CurrentViewport = TheUI.SelectedViewport;
+ }
+#endif
x = Map2ViewportX(CurrentViewport, unit->X) + unit->IX;
y = Map2ViewportY(CurrentViewport, unit->Y) + unit->IY;
Index: stratagus/src/include/deco.h
diff -u stratagus/src/include/deco.h:1.9 stratagus/src/include/deco.h:1.10
--- stratagus/src/include/deco.h:1.9 Fri Jul 11 10:35:30 2003
+++ stratagus/src/include/deco.h Wed Oct 29 22:46:02 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: deco.h,v 1.9 2003/07/11 14:35:30 n0body Exp $
+// $Id: deco.h,v 1.10 2003/10/30 03:46:02 n0body Exp $
#ifndef __DECO_H__
#define __DECO_H__
@@ -125,8 +125,8 @@
extern Deco *DecorationAdd( void *data,
void (*drawclip)(void *data),
DecorationLevel l,
- unsigned x, unsigned y,
- unsigned w, unsigned h );
+ int x, int y,
+ int w, int h );
extern void DecorationRemove( Deco *d );
extern void DecorationRemoveLevels( DecorationLevel min, DecorationLevel max );
Index: stratagus/src/include/map.h
diff -u stratagus/src/include/map.h:1.100 stratagus/src/include/map.h:1.101
--- stratagus/src/include/map.h:1.100 Thu Sep 11 18:07:53 2003
+++ stratagus/src/include/map.h Wed Oct 29 22:46:02 2003
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: map.h,v 1.100 2003/09/11 22:07:53 n0body Exp $
+// $Id: map.h,v 1.101 2003/10/30 03:46:02 n0body Exp $
#ifndef __MAP_H__
#define __MAP_H__
@@ -348,6 +348,8 @@
#ifdef NEW_DECODRAW
/// FIXME: docu
extern void InitMapDecoration(void);
+ /// Decoration for the map.
+extern Deco* MapDecoration;
#endif
/// Use original style fog of war
Index: stratagus/src/include/stratagus.h
diff -u stratagus/src/include/stratagus.h:1.24
stratagus/src/include/stratagus.h:1.25
--- stratagus/src/include/stratagus.h:1.24 Tue Oct 28 17:41:14 2003
+++ stratagus/src/include/stratagus.h Wed Oct 29 22:46:02 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: stratagus.h,v 1.24 2003/10/28 22:41:14 n0body Exp $
+// $Id: stratagus.h,v 1.25 2003/10/30 03:46:02 n0body Exp $
#ifndef __STRATAGUS_H__
#define __STRATAGUS_H__
@@ -44,6 +44,7 @@
#define noUSE_SDL /// Remove no for sdl support
#define noUSE_SDLA /// Remove no for sdl audio support
+#define noNEW_DECODRAW /// Remove no for advanced decoration
support.
/**
** Define this to support load of compressed (gzip) pud files
Index: stratagus/src/map/map_draw.c
diff -u stratagus/src/map/map_draw.c:1.50 stratagus/src/map/map_draw.c:1.51
--- stratagus/src/map/map_draw.c:1.50 Sat Sep 27 17:06:54 2003
+++ stratagus/src/map/map_draw.c Wed Oct 29 22:46:02 2003
@@ -29,7 +29,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: map_draw.c,v 1.50 2003/09/27 21:06:54 jsalmon3 Exp $
+// $Id: map_draw.c,v 1.51 2003/10/30 03:46:02 n0body Exp $
//@{
@@ -195,7 +195,7 @@
/**
** Decoration as registered for decoration mechanism to draw map tiles
*/
-local Deco *mapdeco = NULL;
+global Deco *MapDecoration = NULL;
#endif
/*----------------------------------------------------------------------------
@@ -2761,6 +2761,8 @@
int y;
int w;
int h;
+ int w2;
+ int x2;
int nextline;
extern int ClipX1;
@@ -2768,22 +2770,26 @@
extern int ClipX2;
extern int ClipY2;
-// VideoDrawRectangle(ColorWhite, ClipX1, ClipY1,
-// ClipX2-ClipX1+1, ClipY2-ClipY1+1);
+ VideoDrawRectangle(ColorWhite, ClipX1, ClipY1,
+ ClipX2-ClipX1+1, ClipY2-ClipY1+1);
w = (ClipX2 - ClipX1) / TileSizeX + 1;
h = (ClipY2 - ClipY1) / TileSizeY + 1;
- x = (ClipX1 - TheUI.MapX) / TileSizeX;
- y = (ClipY1 - TheUI.MapY) / TileSizeY;
- src = TheMap.Fields + MapX + x + (MapY + y) * TheMap.Width;
- x = TheUI.MapX + x * TileSizeX;
- y = TheUI.MapY + y * TileSizeY;
+ x = (ClipX1 - TheUI.SelectedViewport->X) / TileSizeX;
+ y = (ClipY1 - TheUI.SelectedViewport->Y) / TileSizeY;
+ DebugLevel3Fn("%d %d %d %d\n" _C_ x _C_ y _C_ w _C_ h);
+ src = TheMap.Fields + TheUI.SelectedViewport->MapX + x +
(TheUI.SelectedViewport->MapY + y) * TheMap.Width;
+ x = TheUI.SelectedViewport->X + x * TileSizeX;
+ y = TheUI.SelectedViewport->Y + y * TileSizeY;
+ /*x = x * TileSizeX;
+ y = y * TileSizeY;*/
+ DebugLevel3Fn("%d %d %d %d->%d %d\n" _C_ ClipX1 _C_ ClipY1 _C_ ClipX2 _C_
ClipY2 _C_ x _C_ y);
nextline = TheMap.Width - w;
do {
- int w2 = w;
-
+ x2 = x;
+ w2 = w;
do {
- MapDrawTile(src->SeenTile, x, y);
- x += TileSizeX;
+ MapDrawTile(src->SeenTile, x2, y);
+ x2 += TileSizeX;
++src;
}
while (--w2);
@@ -2816,9 +2822,17 @@
// not done here, making the switch(VideoBpp) obsolete..
MapDrawTile = MapDrawXXTileClip;
VideoDrawTile = VideoDrawXXTileClip;
- mapdeco = DecorationAdd(NULL /* no data to pass to */,
- mapdeco_draw, LevGround, TheUI.MapX, TheUI.MapY,
- TheUI.MapEndX - TheUI.MapX + 1, TheUI.MapEndY - TheUI.MapY + 1);
+ DebugLevel0Fn("Adding a big deco %d,%d - %d %d\n" _C_
+ TheUI.SelectedViewport->X _C_ TheUI.SelectedViewport->Y _C_
+ (TheUI.SelectedViewport->EndY - 1)* TileSizeX _C_
+ (TheUI.SelectedViewport->EndX - 1) * TileSizeY);
+ MapDecoration = DecorationAdd(NULL /* no data to pass to */,
+ mapdeco_draw, LevGround, TheUI.SelectedViewport->X,
TheUI.SelectedViewport->Y,
+ (TheUI.SelectedViewport->EndY - 1) * TileSizeX,
+ (TheUI.SelectedViewport->EndX - 1) * TileSizeY);
+// TheUI.SelectedViewport->EndX - TheUI.SelectedViewport->X + 1,
+// TheUI.SelectedViewport->EndY - TheUI.SelectedViewport->Y + 1);
+ DebugCheck(!MapDecoration);
#else
if (TileSizeX == 16 && TileSizeY == 16) {
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.142 stratagus/src/ui/ccl_ui.c:1.143
--- stratagus/src/ui/ccl_ui.c:1.142 Fri Oct 24 23:12:17 2003
+++ stratagus/src/ui/ccl_ui.c Wed Oct 29 22:46:02 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_ui.c,v 1.142 2003/10/25 03:12:17 n0body Exp $
+// $Id: ccl_ui.c,v 1.143 2003/10/30 03:46:02 n0body Exp $
//@{
@@ -1343,6 +1343,7 @@
sublist = gh_cdr(sublist);
w = gh_scm2int(gh_car(value));
h = gh_scm2int(gh_car(gh_cdr(value)));
+ DebugLevel3Fn("Map are size is %d %d\n" _C_ w _C_ h);
} else {
errl("Unsupported tag", value);
}
Index: stratagus/src/video/deco.c
diff -u stratagus/src/video/deco.c:1.11 stratagus/src/video/deco.c:1.12
--- stratagus/src/video/deco.c:1.11 Fri Jul 11 10:35:34 2003
+++ stratagus/src/video/deco.c Wed Oct 29 22:46:03 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: deco.c,v 1.11 2003/07/11 14:35:34 n0body Exp $
+// $Id: deco.c,v 1.12 2003/10/30 03:46:03 n0body Exp $
//@{
@@ -347,8 +347,8 @@
extern Deco *DecorationAdd( void *data,
void (*drawclip)(void *data),
DecorationLevel l,
- unsigned x, unsigned y,
- unsigned w, unsigned h );
+ int x, int y,
+ int w, int h );
extern void DecorationRemove( Deco *d );
extern void DecorationRemoveLevels( DecorationLevel min, DecorationLevel max );
@@ -384,7 +384,7 @@
** dirtyscreen_size = the total size in bytes of the array
**/
static unsigned char *dirtyscreen = NULL;
-static unsigned dirtyscreen_xtiles, dirtyscreen_ytiles, dirtyscreen_size,
+static int dirtyscreen_xtiles, dirtyscreen_ytiles, dirtyscreen_size,
dirtyscreen_xbitmaps, dirtyscreen_ybitmaps;
/**
@@ -635,8 +635,8 @@
// means detailed smaller tiles, but also costs more memory.
dirtyscreen_xtiles = (VideoWidth >> DIRTYSCREEN_BITDETAIL);
dirtyscreen_ytiles = (VideoHeight >> DIRTYSCREEN_BITDETAIL);
- DebugCheck( (dirtyscreen_xtiles<<DIRTYSCREEN_BITDETAIL)!=VideoWidth ||
- (dirtyscreen_ytiles<<DIRTYSCREEN_BITDETAIL)!=VideoHeight );
+// DebugCheck( (dirtyscreen_xtiles<<DIRTYSCREEN_BITDETAIL)!=VideoWidth ||
+// (dirtyscreen_ytiles<<DIRTYSCREEN_BITDETAIL)!=VideoHeight );
// Get memory for array dirtyscreen as 4x4bit matrixes each denoting 16
// tiles. So (dirtyscreen_xtiles*dirtyscreen_ytiles)/16 matrixes of 2 bytes
@@ -674,7 +674,7 @@
global void debugdirtyscreen(void)
{
char *p;
- unsigned int x, y, xbit, ybit, mask;
+ int x, y, xbit, ybit, mask;
printf( " " );
for ( x=y=0; x<dirtyscreen_xtiles; y++ )
@@ -710,7 +710,7 @@
** pre : given (x,y) should be inside screen resolution as given through
** DecorationInit
**/
-static void MarkPos( unsigned x, unsigned y )
+/*static void MarkPos( unsigned x, unsigned y )
{
char *p;
unsigned bits;
@@ -740,7 +740,7 @@
bits |= ( 1 << ((x & 0x000F) + ((y & 0x000F)<<2)) );
p[0] = bits & 0x00FF;
p[1] = (bits >> 8);
-}
+}*/
/**
** Marks given area on screen as 'dirty', which can later be checked
@@ -990,7 +990,7 @@
** FOR DEBUG PURPOSE ONLY
** Will print the given 16bit as 4x4 tiles.
*/
-global debugdecobits( unsigned int bits )
+global void debugdecobits( unsigned int bits )
{
int y;
printf( "16bits as 4x4: 3210\n" );
@@ -1046,7 +1046,7 @@
** FOR DEBUG PURPOSE ONLY
** Will print the given t as separate bitvalues.
*/
-global debugsinglebits( DecorationSingle *t )
+global void debugsinglebits( DecorationSingle *t )
{
char *p;
unsigned long topleftscreen, toprightscreen, bottomleftscreen,
@@ -1184,14 +1184,15 @@
** @param w = width in pixels of area to be drawn from (x,y)
** @param h = height in pixels of area to be drawn from (x,y)
**/
-static DecorationSingle *DecorationSingleNew( unsigned x, unsigned y,
- unsigned w, unsigned h )
+static DecorationSingle *DecorationSingleNew( int x, int y, int w, int h )
{
DecorationSingle *t;
- unsigned bitindex, xmaskhead, xmasktail, ymaskhead, ymasktail;
+ int bitindex, xmaskhead, xmasktail, ymaskhead, ymasktail;
+
+ DebugLevel3Fn("%d %d %d %d\n" _C_ x _C_ y _C_ w _C_ h);
DebugCheck( x < 0 || y < 0 || w <= 0 || h <= 0 ||
- (x+w) >= VideoWidth || (y+h) >= VideoHeight );
+ (x+w) > VideoWidth || (y+h) > VideoHeight );
// Fill in this new Decoration so it can be used
t = DecorationSingleAllocate();
@@ -1285,12 +1286,12 @@
Deco *DecorationAdd( void *data,
void (*drawclip)(void *data),
DecorationLevel l,
- unsigned x, unsigned y,
- unsigned w, unsigned h )
+ int x, int y, int w, int h )
{
DecorationSingle **prevt;
Deco *list, *d, *prv, **pprv;
+ DebugLevel3Fn("%d %d %d %d\n" _C_ x _C_ y _C_ w _C_ h);
// Allocate and fill in this new DecorationType so it can be used
d = DecorationAllocate();
d->drawclip = drawclip;
@@ -1396,7 +1397,7 @@
** (note that not the minimum area, but a somehwat bigger area can be
** invalidated for efficiency reasons).
**/
-static void InvalidateDirtyscreen(void)
+/*static void InvalidateDirtyscreen(void)
{
char *p;
unsigned bits, pixelx, pixely, pixelstep, dirtylinesize, xcount, ycount;
@@ -1443,7 +1444,7 @@
// Invalidate remaining rectangles, which have their shadow beyond VideoHeight
SweeplineInvalidateAll();
-}
+}*/
/**
** Draw all decorations, independently if they cover dirty pixels or not.
@@ -1455,24 +1456,26 @@
**/
void DecorationRefreshDisplay(void)
{
- Deco *d;
- int i;
+ Deco *d;
+ int i;
-// save clip rectangle
- PushClipping();
+ // save clip rectangle
+ PushClipping();
-// Handle each decoration (not the singles)
- for ( i = 0; i < LevCount; i++ )
- for ( d = dhead[i]; d; d = d->nxt )
- DrawArea( d->x, d->y, d->w, d->h, d->data, d->drawclip );
+ // Handle each decoration (not the singles)
+ for (i = 0; i < LevCount; i++) {
+ for (d = dhead[i]; d; d = d->nxt) {
+ DrawArea(d->x, d->y, d->w, d->h, d->data, d->drawclip);
+ }
+ }
- Invalidate();
+ Invalidate();
-// reset dirty array, to remember new updates for next refresh
- ClearDirtyscreen();
+ // reset dirty array, to remember new updates for next refresh
+ ClearDirtyscreen();
-// restore clip rectangle
- PopClipping();
+ // restore clip rectangle
+ PopClipping();
}
/**
Index: stratagus/src/video/sweepline.h
diff -u stratagus/src/video/sweepline.h:1.7 stratagus/src/video/sweepline.h:1.8
--- stratagus/src/video/sweepline.h:1.7 Mon Oct 20 18:44:50 2003
+++ stratagus/src/video/sweepline.h Wed Oct 29 22:46:03 2003
@@ -1,7 +1,7 @@
// _________ __ __
// / _____// |_____________ _/ |______ ____ __ __ ______
// \_____ \\ __\_ __ \__ \\ __\__ \ / ___\| | \/ ___/
-// / \| | | | \// __ \| | / __ \_/ /_/ > | /\___ \
+// / \| | | | \|/ __ \| | / __ \_/ /_/ > | /\___ |
// /_______ /|__| |__| (____ /__| (____ /\___ /|____//____ >
// \/ \/ \//_____/ \/
// ______________________ ______________________
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: sweepline.h,v 1.7 2003/10/20 22:44:50 jsalmon3 Exp $
+// $Id: sweepline.h,v 1.8 2003/10/30 03:46:03 n0body Exp $
#ifndef __SWEEPLINE_H__
#define __SWEEPLINE_H__
Index: stratagus/src/video/video.c
diff -u stratagus/src/video/video.c:1.68 stratagus/src/video/video.c:1.69
--- stratagus/src/video/video.c:1.68 Thu Oct 16 13:03:01 2003
+++ stratagus/src/video/video.c Wed Oct 29 22:46:03 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: video.c,v 1.68 2003/10/16 17:03:01 jsalmon3 Exp $
+// $Id: video.c,v 1.69 2003/10/30 03:46:03 n0body Exp $
//@{
@@ -291,7 +291,9 @@
if (left > right || top > bottom || left < 0 || left >= VideoWidth ||
top < 0 || top >= VideoHeight || right < 0 ||
right >= VideoWidth || bottom < 0 || bottom >= VideoHeight) {
- DebugLevel0Fn("Wrong clipping, write cleaner code.\n");
+ DebugLevel0Fn("Wrong clipping %d->%d %d->%d, write cleaner code.\n" _C_
+ left _C_ right _C_ top _C_ bottom);
+// DebugCheck(1);
}
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src clone/mainloop.c clone/unit.c clo...,
Crestez Leonard <=