projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981219-1
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index b8026898b0212a18490d2cfdac4e32b16eb76bde..670397fe3d11b4a5bb3e129d2b497fe266f5e0af 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-161,6
+161,10
@@
void BackToFront()
VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS);
}
}
VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS);
}
}
+ if (redraw_mask & REDRAW_DOOR_3)
+ XCopyArea(display, backbuffer, window, gc,
+ EX, EY, EXSIZE, EYSIZE,
+ EX, EY);
redraw_mask &= ~REDRAW_DOORS;
}
redraw_mask &= ~REDRAW_DOORS;
}
@@
-831,6
+835,8
@@
void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic,
src_x = (graphic % HEROES_PER_LINE) * TILEX + cx;
src_y = (graphic / HEROES_PER_LINE) * TILEY + cy;
}
src_x = (graphic % HEROES_PER_LINE) * TILEX + cx;
src_y = (graphic / HEROES_PER_LINE) * TILEY + cy;
}
+ else /* big font graphics currently not allowed (and not needed) */
+ return;
dest_x = FX + x * TILEX + dx;
dest_y = FY + y * TILEY + dy;
dest_x = FX + x * TILEX + dx;
dest_y = FY + y * TILEY + dy;
@@
-1599,11
+1605,11
@@
unsigned int GetDoorState()
unsigned int MoveDoor(unsigned int door_state)
{
unsigned int MoveDoor(unsigned int door_state)
{
- static
unsigned
int door1 = DOOR_OPEN_1;
- static
unsigned
int door2 = DOOR_CLOSE_2;
- static long door_delay = 0;
+ static int door1 = DOOR_OPEN_1;
+ static int door2 = DOOR_CLOSE_2;
+ static
unsigned
long door_delay = 0;
int x, start, stepsize = 2;
int x, start, stepsize = 2;
- long door_delay_value = stepsize * 5;
+
unsigned
long door_delay_value = stepsize * 5;
if (door_state == DOOR_GET_STATE)
return(door1 | door2);
if (door_state == DOOR_GET_STATE)
return(door1 | door2);
@@
-1730,10
+1736,15
@@
unsigned int MoveDoor(unsigned int door_state)
int ReadPixel(Drawable d, int x, int y)
{
int ReadPixel(Drawable d, int x, int y)
{
- static XImage *pixelimage;
+ XImage *pixel_image;
+ unsigned long pixel_value;
+
+ pixel_image = XGetImage(display, d, x, y, 1, 1, AllPlanes, ZPixmap);
+ pixel_value = XGetPixel(pixel_image, 0, 0);
+
+ XDestroyImage(pixel_image);
- pixelimage = XGetImage(display, d, x, y, 1, 1, AllPlanes, ZPixmap);
- return(XGetPixel(pixelimage, 0, 0));
+ return pixel_value;
}
int el2gfx(int element)
}
int el2gfx(int element)