Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16681/include
Modified Files:
bitmaps.h data.h defs.h proto.h
Log Message:
This patch adds scalability to the local window. New netrekrc option
scaleFactor controls the scale, which can go from normal to 4x zoom.
Control-a and control-z keys are now used to zoom in/out.
SCALE was replaced by scaleFactor in many places, though SCALE
is still used extensively.
Many bitmap drawing functions now are scaled via a SCALE /
scaleFactor. Also, many bitmaps that were never scaled before,
i.e. the old bitmap sets, shield, cloak, explosions, etc..are now scaled.
This has the added bonus of making the old ship bitmap sets show
ships to 256 positions.
Fixed some inconsistencies in how clearzones were defined in local.c,
such as in the case of warnHull option.
Fixed stars and inforange box to work at different zooms.
Fixed the scalebitmap functions to use the color/palette on the
globalmemdc2 for the first stretch bitmap operation, otherwise color
info was lost.
Allowing keyboard actions in richtext windows - this allows for copy
/paste, however still the major problem of the richtext window proc
not doing anything, thus keystrokes are ignored.
Army/wrench/fuel icons were replaced by the unused art icons I had
made but never used, since these now scale up to 4x (the old army/
wrench/fuel didn't look good at 4x zoom).
Cleaned up a bunch of stray pixels in the highres ship bitmap sets,
that were noticeable at higher zooms.
Fixed the planet resource location and clearzones for both local
and galactic planets with the new planet bitmaps.
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- defs.h 6 Apr 2007 06:46:31 -0000 1.19
+++ defs.h 7 Apr 2007 05:17:38 -0000 1.20
@@ -45,6 +45,8 @@
#define GWIDTH 100000 /* galaxy is 100000 spaces
* on a side */
+#define SCALE 40 /* Window will be one pixel for
+ these # spaces */
#define WARP1 20 /* warp one will move 20
* spaces per update */
#define EXPDIST 350 /* At this range a torp will
Index: bitmaps.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- bitmaps.h 6 Apr 2007 06:46:31 -0000 1.16
+++ bitmaps.h 7 Apr 2007 05:17:38 -0000 1.17
@@ -176,14 +176,14 @@
// Resources
#define BMP_ARMYBMP 10
-#define BMP_ARMY_WIDTH 10
-#define BMP_ARMY_HEIGHT 30
+#define BMP_ARMY_WIDTH 40
+#define BMP_ARMY_HEIGHT 120
#define BMP_WRENCHBMP 11
-#define BMP_WRENCH_WIDTH 30
-#define BMP_WRENCH_HEIGHT 10
+#define BMP_WRENCH_WIDTH 120
+#define BMP_WRENCH_HEIGHT 40
#define BMP_FUELBMP 12
-#define BMP_FUEL_WIDTH 10
-#define BMP_FUEL_HEIGHT 30
+#define BMP_FUEL_WIDTH 40
+#define BMP_FUEL_HEIGHT 120
#define BMP_CPLANET_WIDTH 120
#define BMP_CPLANET_HEIGHT 120
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- data.h 6 Apr 2007 06:46:31 -0000 1.72
+++ data.h 7 Apr 2007 05:17:38 -0000 1.73
@@ -51,7 +51,6 @@
/* These used to be defines ... */
extern int TWINSIDE;
extern int GWINSIDE;
-extern int SCALE;
extern unsigned int oldalert;
extern unsigned char oldtourn;
@@ -738,4 +737,5 @@
extern int sortPlanets; /* sort planet list by team and army count */
extern int packetLights; /* show packet send/receive via dashboard */
extern int infoRange; /* show limit on info with large tactical windows */
+extern int scaleFactor; /* allows for scaling of graphics */
#endif /* _h_data */
Index: proto.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- proto.h 5 Apr 2007 12:57:22 -0000 1.45
+++ proto.h 7 Apr 2007 05:17:38 -0000 1.46
@@ -387,6 +387,7 @@
Key163 (W_Event * data),
Key175 (W_Event * data),
Key180 (W_Event * data),
+ Key193 (void),
Key194 (W_Event * data),
Key195 (W_Event * data),
Key197 (W_Event * data),
@@ -397,7 +398,8 @@
Key204 (W_Event * data),
Key205 (W_Event * data),
Key208 (W_Event * data),
- Key212 (W_Event * data);
+ Key212 (W_Event * data),
+ Key218 (void);
/******************************************************************************/
/*** interface.c