Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25812/src
Modified Files:
data.c defaults.c local.c option.c
Log Message:
Puckcircle option to show max puck pressor range.
Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- local.c 23 Jun 2006 10:07:07 -0000 1.44
+++ local.c 25 Jun 2006 08:19:40 -0000 1.45
@@ -1179,7 +1179,22 @@
clearcount++;
}
}
-
+#ifdef HOCKEY_LINES
+ /* Puck circle */
+ if (puckCircle && hockey_mode)
+ {
+ if (myPlayer(j) || isObsLockPlayer(j))
+ {
+ W_WriteCircle(w, WINSIDE/2, WINSIDE/2, SHOTRANGE/SCALE, 0, W_Grey);
+ clearzone[0][clearcount] = WINSIDE/2 - (SHOTRANGE/SCALE);
+ clearzone[1][clearcount] = WINSIDE/2 - (SHOTRANGE/SCALE);
+ clearzone[2][clearcount] = 2*SHOTRANGE/SCALE;
+ clearzone[3][clearcount] = 2*SHOTRANGE/SCALE;
+ clearcount++;
+ }
+ }
+#endif
+
#ifdef BEEPLITE
if (tts_timer)
{
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- defaults.c 23 Jun 2006 08:50:14 -0000 1.27
+++ defaults.c 25 Jun 2006 08:19:40 -0000 1.28
@@ -439,6 +439,12 @@
}
},
#endif
+ {"puckCircle", &puckCircle, RC_BOOL,
+ {
+ "Show the puck's max shot range as a circle around your ship",
+ NULL
+ }
+ },
{"redrawDelay", &redrawDelay, RC_INT,
{
"Number of updates before redraw",
@@ -1480,6 +1486,7 @@
showPlanetOwner = booleanDefault ("showPlanetOwner", showPlanetOwner);
newDashboard = intDefault ("newDashboard", newDashboard);
detCircle = booleanDefault ("detCircle", detCircle);
+ puckCircle = booleanDefault ("puckCircle", puckCircle);
showArmy = booleanDefault ("showArmy", showArmy);
updatesPerSec = intDefault ("updatesPerSec", updatesPerSec);
redrawDelay = intDefault ("redrawDelay", redrawDelay);
Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- option.c 13 Jun 2006 11:18:23 -0000 1.23
+++ option.c 25 Jun 2006 08:19:40 -0000 1.24
@@ -271,6 +271,9 @@
{1, "shrink phasers on a miss", &shrinkPhaserOnMiss, 0, 0, 0, NULL, NULL},
{1, "report kills", &reportKills, 0, 0, 0, NULL, NULL},
{1, "show det circle", &detCircle, 0, 0, 0, NULL, NULL},
+#ifdef HOCKEY_LINES
+ {1, "show puck circle", &puckCircle, 0, 0, 0, NULL, NULL},
+#endif
{1, "done", ¬done, 0, 0, 0, NULL, NULL},
{-1, NULL, 0, 0, 0, 0, NULL, NULL}
};
@@ -899,6 +902,12 @@
if (showHockeyScore && !hockey_mode ())
showHockeyScore = 0;
}
+ else if (op->op_option == &puckCircle)
+ {
+ // same as above
+ if (puckCircle && !hockey_mode ())
+ puckCircle = 0;
+ }
#endif
/* Let's see if this is our double buffering changed */
else if (op->op_option == &doubleBuffering)
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- data.c 23 Jun 2006 08:50:14 -0000 1.39
+++ data.c 25 Jun 2006 08:19:40 -0000 1.40
@@ -55,6 +55,7 @@
int old_db = 0; /* should be same as
* newDashboard */
int detCircle = 0; /* Show det circle on tactical */
+int puckCircle = 0; /* Show maximum puck shooting distance on tactical */
int showArmy = 1; /* Show army count of planet you are orbiting */
int fastQuit = 0;
int gen_distress = 0; /* generic distress/macro