Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv10113/src
Modified Files:
input.c local.c map.c
Log Message:
Changed back to the old army icon, the new one was just too ugly.
Decreased step size of zoom keys.
Turned off the extra border redraws during cambot playback.
Added a little fudge factor to the planet resources by drawing them
all 1 pixel wider, this has a big impact on the quality of the graphics
as due to rounding, they tended to get squished. Update the clear
routines accordingly.
Removed the army men/gas can/wrench from the unused art
section as they got used (well 2 of them did).
Added 2 pieces of art taken from gltrek.
Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- input.c 7 Apr 2007 05:17:39 -0000 1.33
+++ input.c 7 Apr 2007 11:35:27 -0000 1.34
@@ -3546,7 +3546,7 @@
void
Key193 (void)
{
- scaleFactor -= 5;
+ scaleFactor -= 2;
if (scaleFactor < 10)
scaleFactor = 10;
W_FastClear = 1;
@@ -3560,7 +3560,7 @@
void
Key218 (void)
{
- scaleFactor += 5;
+ scaleFactor += 2;
if (scaleFactor > 40)
scaleFactor = 40;
W_FastClear = 1;
Index: map.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- map.c 7 Apr 2007 05:17:39 -0000 1.44
+++ map.c 7 Apr 2007 11:35:27 -0000 1.45
@@ -446,9 +446,9 @@
{
/* Select resources */
if (p->pl_armies > 4)
- W_WriteScaleBitmap(dx - destwidth/3,
+ W_WriteScaleBitmap(dx - destwidth/3 - 1,
dy,
- destwidth/3,
+ destwidth/3 + 1,
destheight,
BMP_ARMY_WIDTH,
BMP_ARMY_HEIGHT,
@@ -457,9 +457,9 @@
window);
if (p->pl_flags & PLREPAIR)
W_WriteScaleBitmap(dx,
- dy - destheight/3,
+ dy - destheight/3 - 1,
destwidth,
- destheight/3,
+ destheight/3 + 1,
BMP_WRENCH_WIDTH,
BMP_WRENCH_HEIGHT,
0,
@@ -468,7 +468,7 @@
if (p->pl_flags & PLFUEL)
W_WriteScaleBitmap(dx + destwidth,
dy,
- destwidth/3,
+ destwidth/3 + 1,
destheight,
BMP_FUEL_WIDTH,
BMP_FUEL_HEIGHT,
@@ -550,10 +550,10 @@
/* XFIX */
if (planetBitmapGalaxy == 3)
- W_ClearArea (mapw, odx - (5 * BMP_MPLANET_WIDTH / 6),
- ody - (5 * BMP_MPLANET_HEIGHT / 6),
- 5 * BMP_MPLANET_WIDTH / 3,
- 4 * BMP_MPLANET_HEIGHT / 3);
+ W_ClearArea (mapw, odx - (5 * BMP_MPLANET_WIDTH / 6) - 1,
+ ody - (5 * BMP_MPLANET_HEIGHT / 6) - 1,
+ 5 * BMP_MPLANET_WIDTH / 3 + 2,
+ 4 * BMP_MPLANET_HEIGHT / 3 + 1);
else
W_ClearArea (mapw, odx - (BMP_MPLANET_WIDTH / 2),
ody - (BMP_MPLANET_HEIGHT / 2),
@@ -570,10 +570,10 @@
/* XFIX */
if (planetBitmapGalaxy == 3)
- W_ClearArea (mapw, dx - (5 * BMP_MPLANET_WIDTH / 6),
- dy - (5 * BMP_MPLANET_HEIGHT / 6),
- 5 * BMP_MPLANET_WIDTH / 3,
- 4 * BMP_MPLANET_HEIGHT / 3 + 4);
+ W_ClearArea (mapw, dx - (5 * BMP_MPLANET_WIDTH / 6) - 1,
+ dy - (5 * BMP_MPLANET_HEIGHT / 6) - 1,
+ 5 * BMP_MPLANET_WIDTH / 3 + 2,
+ 4 * BMP_MPLANET_HEIGHT / 3 + 5);
else
/* The +4 and +8 are for beeplite, as it uses a
24x24 overlay bitmap compared to 16x16 planet */
Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- local.c 7 Apr 2007 05:17:39 -0000 1.88
+++ local.c 7 Apr 2007 11:35:27 -0000 1.89
@@ -482,9 +482,9 @@
{
/* Select resources */
if (p->pl_armies > 4)
- W_WriteScaleBitmap(dx - destwidth/3,
+ W_WriteScaleBitmap(dx - destwidth/3 - 1,
dy,
- destwidth/3,
+ destwidth/3 + 1,
destheight,
BMP_ARMY_WIDTH,
BMP_ARMY_HEIGHT,
@@ -493,9 +493,9 @@
window);
if (p->pl_flags & PLREPAIR)
W_WriteScaleBitmap(dx,
- dy - destheight/3,
+ dy - destheight/3 - 1,
destwidth,
- destheight/3,
+ destheight/3 + 1,
BMP_WRENCH_WIDTH,
BMP_WRENCH_HEIGHT,
0,
@@ -504,7 +504,7 @@
if (p->pl_flags & PLFUEL)
W_WriteScaleBitmap(dx + destwidth,
dy,
- destwidth/3,
+ destwidth/3 + 1,
destheight,
BMP_FUEL_WIDTH,
BMP_FUEL_HEIGHT,
@@ -643,10 +643,10 @@
}
if (planetBitmap == 3)
{
- clearzone[0][clearcount] = dx - (5 * BMP_PLANET_WIDTH / 6 * SCALE / scaleFactor);
- clearzone[1][clearcount] = dy - (5 * BMP_PLANET_HEIGHT / 6 * SCALE / scaleFactor);
- clearzone[2][clearcount] = (5 * BMP_PLANET_WIDTH / 3 * SCALE / scaleFactor);
- clearzone[3][clearcount] = (4 * BMP_PLANET_HEIGHT / 3 * SCALE / scaleFactor);
+ clearzone[0][clearcount] = dx - (5 * BMP_PLANET_WIDTH / 6 * SCALE / scaleFactor) - 1;
+ clearzone[1][clearcount] = dy - (5 * BMP_PLANET_HEIGHT / 6 * SCALE / scaleFactor) - 1;
+ clearzone[2][clearcount] = (5 * BMP_PLANET_WIDTH / 3 * SCALE / scaleFactor) + 2;
+ clearzone[3][clearcount] = (4 * BMP_PLANET_HEIGHT / 3 * SCALE / scaleFactor) + 1;
}
else
{
@@ -2687,8 +2687,12 @@
/* Force a border redraw? Bitmaps rotated realtime as well as viewRange circles
will overwrite the border. Since it is very CPU expensive to write
rectangles (drawborder function) to the active window, especially if double
- buffering is off, let's slow down redraws to at most 10 per second */
+ buffering is off, let's slow down redraws to at most 10 per second.
+ Turned off during playback due to excessive CPU usage. */
else
+#ifdef RECORDGAME
+ if (!playback)
+#endif
{
static int border_refresh = 0;