[netrek-cvs] client/netrekxp/src data.c, 1.64, 1.65 defaults.c, 1.56, 1.57 local.c, 1.70, 1.71 option.c, 1.33, 1.34

[Bill Balcerski]

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

Modified Files:
	data.c defaults.c local.c option.c 
Log Message:
Netrekrc option for puck heading marker.

Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- local.c	15 Mar 2007 03:09:16 -0000	1.70
+++ local.c	15 Mar 2007 15:39:27 -0000	1.71
@@ -1180,6 +1180,28 @@
                     clearcount++;
                 }
             }
+            /* Puck tick heading */
+            if (puckArrow && playing_hockey &&
+                j->p_speed != 0 &&
+                strcmp(j->p_name, "Puck") == 0 &&
+                strcmp(j->p_login, "Robot") == 0 &&
+                j->p_team == NOBODY &&
+                j->p_ship.s_type == SCOUT)
+            {
+                int startx, starty, endx, endy;
+
+                startx = dx + (int) ((shield_width / 2) * Cos[j->p_dir]);
+                starty = dy + (int) ((shield_width / 2) * Sin[j->p_dir]);
+                endx = startx + (int) (PUCKARROW_LEN * Cos[j->p_dir]);
+                endy = starty + (int) (PUCKARROW_LEN * Sin[j->p_dir]);
+
+                W_MakeLine(w, startx, starty, endx, endy, W_White);
+                clearline[0][clearlcount] = startx;
+                clearline[1][clearlcount] = starty;
+                clearline[2][clearlcount] = endx;
+                clearline[3][clearlcount] = endy;
+                clearlcount++;
+            }
 #endif
 
 #ifdef BEEPLITE

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- defaults.c	15 Mar 2007 04:34:44 -0000	1.56
+++ defaults.c	15 Mar 2007 15:39:27 -0000	1.57
@@ -484,6 +484,12 @@
         }
     },
 #endif
+    {"puckArrow", &puckArrow, RC_BOOL,
+        {
+            "Put a small tic mark on the puck to indicate its direction",
+            NULL
+        }
+    },
     {"puckCircle", &puckCircle, RC_BOOL,
         {
             "Show the puck's max shot range as a circle around your ship",
@@ -1579,7 +1585,7 @@
 #ifdef HOCKEY_LINES
     showHockeyLinesLocal = booleanDefault ("showHockeyLinesLocal", showHockeyLinesLocal);
     showHockeyLinesMap = booleanDefault ("showHockeyLinesMap", showHockeyLinesMap);
-	showHockeyScore = booleanDefault ("showHockeyScore", showHockeyScore);
+    showHockeyScore = booleanDefault ("showHockeyScore", showHockeyScore);
 #endif
 
     saveBig = booleanDefault ("saveBig", saveBig);
@@ -1601,6 +1607,7 @@
     newDashboard = intDefault ("newDashboard", newDashboard);
     detCircle = booleanDefault ("detCircle", detCircle);
     puckCircle = booleanDefault ("puckCircle", puckCircle);
+    puckArrow = booleanDefault ("puckArrow", puckArrow);
     showArmy = booleanDefault ("showArmy", showArmy);
     redrawDelay = intDefault ("redrawDelay", redrawDelay);
     planetHighlighting = booleanDefault ("planetHighlighting", planetHighlighting);

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- option.c	14 Mar 2007 18:36:07 -0000	1.33
+++ option.c	15 Mar 2007 15:39:27 -0000	1.34
@@ -274,6 +274,7 @@
     {1, "show det circle", &detCircle, 0, 0, 0, NULL, NULL},
 #ifdef HOCKEY_LINES
     {1, "show puck circle", &puckCircle, 0, 0, 0, NULL, NULL},
+    {1, "show puck arrow", &puckArrow, 0, 0, 0, NULL, NULL},
 #endif
     {1, "done", &notdone, 0, 0, 0, NULL, NULL},
     {-1, NULL, 0, 0, 0, 0, NULL, NULL}

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- data.c	15 Mar 2007 04:34:44 -0000	1.64
+++ data.c	15 Mar 2007 15:39:27 -0000	1.65
@@ -756,6 +756,7 @@
 int mainTitleBar = 0;
 int observerMode = 0;
 int showHockeyScore = 1;
+int puckArrow = 1;
 
 int observerPorts[] = { 2593, 2595, 4000, 5000, 0 };