Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27792/include
Modified Files:
data.h defs.h
Log Message:
Moved galaxy width from a static to dynamic define. Very little had to change for this, most of the work had been done previously on prior paradise patches. All this patch does is remove the different definitions of GWIDTH depending on if PARADISE is defined. The only way gwidth will be altered is on paradise servers when planets are sent whose (x,y) falls outside of the 100000x100000 area, in which case the paradise protocol indicates that the new galaxy size is assumed to be 200000x200000. There's also a provision for changing the default short packet gwidth but that should never happen.
Index: defs.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- defs.h 13 Apr 2008 02:25:50 -0000 1.29
+++ defs.h 13 Apr 2008 02:48:54 -0000 1.30
@@ -67,13 +67,9 @@
#define DESIRED_TIC_LEN 10 /* for desired heading */
/* These are configuration definitions */
-#ifdef PARADISE
-#define GWIDTH gwidth /* Paradise has variable galaxy
- width, up to 200000 */
-#else
-#define GWIDTH 100000 /* galaxy is 100000 spaces
- * on a side */
-#endif
+#define GWIDTH gwidth /* Normally 100000, but paradise
+ has variable galaxy width, up
+ to 200000 */
#define SCALE 40 /* Window will be one pixel for
these # spaces */
#define WARP1 20 /* warp one will move 20
Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- data.h 13 Apr 2008 02:25:50 -0000 1.95
+++ data.h 13 Apr 2008 02:48:54 -0000 1.96
@@ -58,6 +58,7 @@
extern int GWINSIDE;
extern int nplanets;
+extern int gwidth;
extern unsigned int oldalert;
extern unsigned char oldtourn;
extern unsigned int oldengflag;
@@ -286,7 +287,6 @@
extern int received_terrain_info;
extern int terrain_x;
extern int terrain_y;
-extern int gwidth; /* Paradise version of GWIDTH */
extern int gwidth_zoom; /* galaxy width, adjusted for zoom, unused */
extern int offsetx;
extern int offsety; /* offsets when zooming [BDyess] */