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

Modified Files:
	option.c short.c 
Log Message:
- fixed a bug in the options menu that incorrectly reported whether the phaser window
  was mapped or not
- phasering plasma now has less of an effect on phaser average damage statistics, it
  is counted as your average damage hit, rather than the previous way of counting it
  as a 38 point phaser hit.

Index: short.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/short.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- short.c	12 Apr 2006 04:20:04 -0000	1.2
+++ short.c	15 Apr 2006 11:55:14 -0000	1.3
@@ -1290,7 +1290,8 @@
         {
             phaserStatTry++;
             phaserStatHit++;
-            phaserStatDamage += damage;
+            /* Record as an average damage hit so as not to skew overall average */
+            phaserStatDamage += phaserStatDamage / phaserStatTry;
         }
         if (damage == 37)       /* Miss */
             phaserStatTry++;

Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- option.c	15 Apr 2006 01:04:34 -0000	1.3
+++ option.c	15 Apr 2006 11:55:13 -0000	1.4
@@ -310,7 +310,7 @@
     {1, "show \"your\" message window", 0, &messwi, 0, 0, NULL, NULL},
     {1, "show \"kill\" message window", 0, &messwk, 0, 0, NULL, NULL},
     {1, "show \"total\" message window", 0, &reviewWin, 0, 0, NULL, NULL},
-    {1, "show phaser log window", &phaserWindow, &phaserwin, 0, 0, NULL},
+    {1, "show phaser log window", 0, &phaserwin, 0, 0, NULL},
     {1, "show statistic window", 0, &statwin, 0, 0, NULL, NULL},
     {1, "show help window", 0, &helpWin, 0, 0, NULL, NULL},
     {1, "show hints window", &showHints, &hintWin, 0, 0, NULL, NULL},