Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27792/src
Modified Files:
data.c short.c
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: short.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/short.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- short.c 13 Apr 2008 02:25:52 -0000 1.25
+++ short.c 13 Apr 2008 02:48:54 -0000 1.26
@@ -225,11 +225,7 @@
int spwinside = 500; /* WINSIDE from Server */
#define SPWINSIDE 500 /* To make it safe */
-#ifdef PARADISE
-LONG spgwidth = 100000;
-#else
-LONG spgwidth = GWIDTH;
-#endif
+long spgwidth = 100000;
void
sendThreshold (short unsigned int v)
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- data.c 13 Apr 2008 02:25:50 -0000 1.104
+++ data.c 13 Apr 2008 02:48:54 -0000 1.105
@@ -42,6 +42,7 @@
int nplanets = 40; /* can be larger for paradise servers, dynamically
sent via SP_PLANET2 */
+int gwidth = 100000; /* can be changed by paradise server */
int globalerr = 0; /* For sending error # between threads */
int ingame = 0; /* If player is in game - to distinguish between whether
to use double buffering on the local and map window */
@@ -284,7 +285,6 @@
int received_terrain_info = 0;
int terrain_x;
int terrain_y;
-int gwidth = 100000; /* Paradise version of GWIDTH */
int gwidth_zoom = 100000; /* galaxy width, adjusted for zoom, unused */
int offsetx = 0;
int offsety = 0; /* offsets when zooming [BDyess] */