Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19558/src
Modified Files:
defaults.c map.c option.c
Log Message:
Changed viewRange from on/off to on/only when cloaked/off.
Index: map.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- map.c 19 Mar 2007 02:20:26 -0000 1.33
+++ map.c 19 Mar 2007 04:00:29 -0000 1.34
@@ -1031,10 +1031,12 @@
/* Draw range circle */
if (viewRange && (myPlayer(j) || isObsLockPlayer(j)))
{
- /* Orbitting any non-owned planet gets you seen,
- so don't draw the circle */
+ /* Orbitting any non-owned planet gets you seen,
+ so don't draw the circle */
if ((j->p_flags & PFORBIT) &&
(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) ;
else
{
struct planet *pl;
Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- option.c 19 Mar 2007 00:05:13 -0000 1.39
+++ option.c 19 Mar 2007 04:00:31 -0000 1.40
@@ -169,11 +169,19 @@
"Show New color bitmaps on galactic map",
""
};
+
static char *autowarmess[] = { "Don't auto set war declarations",
"Set war with nonzero player teams",
"Set war with largest enemy team",
""
};
+
+static char *viewrangemess[] = { "Don't show range circle",
+ "Only show range circle when cloaked",
+ "Show range circle at all times",
+ ""
+};
+
/* Only one of op_option, op_targetwin, and op_string should be defined. If
* op_string is defined, op_size should be too and op_text is used without a
* "Don't" prefix. if op_range is defined, there should be a %d in op_text
@@ -397,7 +405,7 @@
#endif
{1, "omit team letter on map", &omitTeamLetter, 0, 0, 0, NULL, NULL},
{1, "draw view box on map", &viewBox, 0, 0, 0, NULL, NULL},
- {1, "draw detect limits on map", &viewRange, 0, 0, 0, NULL, NULL},
+ {1, "", &viewRange, 0, 0, 0, viewrangemess, NULL},
{1, "draw stars on local", &showStars, 0, 0, 0, NULL, NULL},
{1, "draw warp streaks", &warpStreaks, 0, 0, 0, NULL, NULL},
{1, "alert on extra border(s)", &extraAlertBorder, 0, 0, 0, NULL, NULL},
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- defaults.c 19 Mar 2007 00:05:13 -0000 1.59
+++ defaults.c 19 Mar 2007 04:00:27 -0000 1.60
@@ -887,9 +887,12 @@
NULL
}
},
- {"viewRange", &viewRange, RC_BOOL,
+ {"viewRange", &viewRange, RC_INT,
{
"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",
NULL
}
},
@@ -1621,7 +1624,7 @@
omitTeamLetter = booleanDefault ("omitTeamLetter", omitTeamLetter);
beepOnPrivateMessage = booleanDefault ("beepOnPrivateMessage", beepOnPrivateMessage);
viewBox = booleanDefault ("viewBox", viewBox);
- viewRange = booleanDefault ("viewRange", viewRange);
+ viewRange = intDefault ("viewRange", viewRange);
warpStreaks = booleanDefault ("warpStreaks", warpStreaks);
showStars = booleanDefault ("showStars", showStars);