[netrek-cvs] client/netrekxp/src defaults.c, 1.24, 1.25 warning.c, 1.8, 1.9

[Bill Balcerski]

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

Modified Files:
	defaults.c warning.c 
Log Message:
Read in defaults for the 2 new netrekrc options
Fix to phaser message length

Index: warning.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/warning.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- warning.c	3 Jun 2006 21:52:11 -0000	1.8
+++ warning.c	9 Jun 2006 02:14:08 -0000	1.9
@@ -101,7 +101,7 @@
         sprintf (newtext, "%s [%3d%%] [%2u]", text,
                  phaserStatTry ? (phaserStatHit * 100) / phaserStatTry : 0,
                  phaserStatTry ? phaserStatDamage / phaserStatTry : 0);
-        warncount += 14;
+        warncount = strlen (newtext);
         W_WriteText (warnw, 5, 5, textColor, newtext, warncount,
                      W_RegularFont);
     }

Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- defaults.c	6 Jun 2006 19:50:39 -0000	1.24
+++ defaults.c	9 Jun 2006 02:14:08 -0000	1.25
@@ -1471,6 +1471,8 @@
     showArmy = booleanDefault ("showArmy", showArmy);
     updatesPerSec = intDefault ("updatesPerSec", updatesPerSec);
     redrawDelay = intDefault ("redrawDelay", redrawDelay);
+    planetHighlighting = booleanDefault ("planetHighlighting", planetHighlighting);
+    rotatePlanets = booleanDefault ("rotatePlanets", rotatePlanets);
     logging = booleanDefault ("logging", logging);
 
     phaserShrink = intDefault ("phaserShrink", phaserShrink);