[netrek-cvs] client/netrekxp/src data.c, 1.70, 1.71 defaults.c, 1.62, 1.63 map.c, 1.34, 1.35 option.c, 1.40, 1.41

[Bill Balcerski]

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

Modified Files:
	data.c defaults.c map.c option.c 
Log Message:
Added a "only when carrying" option to view range circle.
Fixed up a few macros.

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- data.c	19 Mar 2007 19:59:43 -0000	1.70
+++ data.c	21 Mar 2007 23:59:50 -0000	1.71
@@ -781,7 +781,7 @@
 
 int omitTeamLetter = 0;
 int viewBox = 1;
-int viewRange = 1;
+int viewRange = 2;
 
 struct stringlist *defaults = NULL;
 

Index: map.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- map.c	19 Mar 2007 04:00:29 -0000	1.34
+++ map.c	21 Mar 2007 23:59:50 -0000	1.35
@@ -1037,6 +1037,8 @@
           (planets[j->p_planet].pl_owner != j->p_team)) ;
           /* Don't draw if uncloaked and viewRange is 1 */
           else if (!(j->p_flags & PFCLOAK) && viewRange == 1) ;
+          /* Don't draw if not carrying and viewRange is 2 */
+          else if (j->p_armies == 0 && viewRange == 2) ;
           else
           {
             struct planet *pl;

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- option.c	19 Mar 2007 04:00:31 -0000	1.40
+++ option.c	21 Mar 2007 23:59:50 -0000	1.41
@@ -177,7 +177,8 @@
 };
 
 static char *viewrangemess[] = { "Don't show range circle",
-                                 "Only show range circle when cloaked",
+                                 "Only show range circle if cloaked",
+                                 "Only show range circle if carrying",
                                  "Show range circle at all times",
                                  ""
 };

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- defaults.c	19 Mar 2007 19:59:43 -0000	1.62
+++ defaults.c	21 Mar 2007 23:59:50 -0000	1.63
@@ -907,7 +907,8 @@
             "Show range at which enemies can see you as a circle on map",
             "0 - Don't show range circle",
             "1 - Only show range circle when cloaked",
-            "2 - Show range circle at all times",
+            "2 - Only show range circle when carrying",
+            "3 - Show range circle at all times",
             NULL
         }
     },