Update of /cvsroot/netrek/client/netrekxp/include
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9198/include

Modified Files:
	data.h struct.h 
Log Message:
Fixed some inconsistencies in how a few RCDs were named - "taking" renamed to "take",
"generic" renamed to "help", "help3 and help4" renamed to "help1 and help2", and
"doing3 and doing4" renamed to "doing1 and doing2"
Added "saveWindow: (on)/off" and "saveBeeplite: (on)/off" to allow saving of window placments
and beeplite macros to the netrek.sav file.
Save options now can save windows placements, review window .allow settings, and beeplite 
macros
Changed some default window sizes/locations that were either too small (i.e. help window)
or in a bad spot (i.e. planet window)
Fixed a bunch of spacing inconsistencies
Added/modified a few checkmapped calls in newwin.c to either use the "newish" checkmappedpref
function, or to add a checkmapped check if I felt it should be checked

Index: data.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- data.h	26 May 2006 06:58:19 -0000	1.25
+++ data.h	28 May 2006 23:05:11 -0000	1.26
@@ -598,9 +598,15 @@
 
 extern char * saveFile;  /* file name to save options to */
 extern int saveBig;     /* save options with comments */
+extern int saveWindow;  /* save options with window placements */
 extern int saveMacro;   /* save options with macros */
 extern int saveRCD;     /* save options with RCD */
+#ifdef BEEPLITE
+extern int saveBeeplite; /* save options with Beeplite */
+#endif
+#ifdef RCM
 extern int saveRCM;     /* save options with RCM */
+#endif
 
 extern int tpDotDist;   /* distance between tractor/pressor dots */
 

Index: struct.h
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- struct.h	21 May 2006 09:56:38 -0000	1.9
+++ struct.h	28 May 2006 23:05:11 -0000	1.10
@@ -44,13 +44,13 @@
     take = 1, ogg, bomb, space_control,
     save_planet,
     base_ogg,
-    help3, help4,
+    help1, help2,
 
     /* doing series */
     escorting, ogging, bombing, controlling,
     asw,
     asbomb,
-    doing3, doing4,
+    doing1, doing2,
 
     /* other info series */
     free_beer,                  /* ie. player x is totally
@@ -64,7 +64,7 @@
     other1, other2,
 
     /* just a generic distress call */
-    generic
+    help
 #ifdef RCM
         , rcm
 #endif