Update of /cvsroot/netrek/client/netrekxp/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19465/src
Modified Files:
data.c defaults.c local.c option.c
Log Message:
Remove JUBILEE_PHASER define. No idea why this was ever a define.
Also, the code in local.c for the case where JUBILEE_PHASER was not
defined lacked handling of case PHHIT2.
Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- local.c 8 Jun 2009 22:55:03 -0000 1.119
+++ local.c 9 Jun 2009 00:28:10 -0000 1.120
@@ -1740,11 +1740,9 @@
php = &phasers[j->p_no];
/* Reset colorful phasers here */
-#ifdef JUBILEE_PHASERS
if (j == me && colorfulPhasers
&& (php->ph_status == PHFREE || php->ph_updateFuse == 0))
ph_col = 0;
-#endif
if (php->ph_status != PHFREE)
{
@@ -1895,7 +1893,6 @@
if (friendlyPlayer (j))
{
-#ifdef JUBILEE_PHASERS
if (isMe(j) && php->ph_status == PHHIT && colorfulPhasers)
{
int col;
@@ -1943,17 +1940,6 @@
else
W_CacheLine (w, px, py, tx, ty, shipCol[remap[j->p_team]]);
}
-#else
- if (highlightFriendlyPhasers && (php->ph_status == PHHIT))
- W_CacheLine (w, px, py, tx, ty, foreColor);
- else
- {
- if ((php->ph_fuse % 2) == 1)
- W_CacheLine (w, px, py, tx, ty, foreColor);
- else
- W_CacheLine (w, px, py, tx, ty, shipCol[remap[j->p_team]]);
- }
-#endif
php->ph_fuse++;
clearline[0][clearlcount] = px;
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- defaults.c 9 Jun 2009 00:16:36 -0000 1.102
+++ defaults.c 9 Jun 2009 00:28:10 -0000 1.103
@@ -105,14 +105,12 @@
NULL
}
},
-#ifdef JUBILEE_PHASERS
{"colorfulPhasers", &colorfulPhasers, RC_BOOL,
{
"Display color phasers",
NULL
}
},
-#endif
{"colorWeapons", &colorWeapons, RC_BOOL,
{
"Use colored bitmaps for torps and plasmas",
@@ -1903,10 +1901,7 @@
infoRange = booleanDefault ("infoRange", infoRange);
showMySpeed = booleanDefault ("showMySpeed", showMySpeed);
showOtherSpeed = booleanDefault ("showOtherSpeed", showOtherSpeed);
-
-#ifdef JUBILEE_PHASERS
colorfulPhasers = booleanDefault ("colorfulPhasers", colorfulPhasers);
-#endif
#ifdef SOUND
sound_init = booleanDefault ("sound", sound_init);
Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- option.c 8 Jun 2009 22:55:04 -0000 1.61
+++ option.c 9 Jun 2009 00:28:10 -0000 1.62
@@ -301,9 +301,7 @@
{1, "use auto aim phasers", &autoPhaser, 0, 0, 0, NULL, NULL},
{1, "use color weapon bitmaps", &colorWeapons, 0, 0, 0, NULL, NULL},
{1, "show weapons on galactic", &weaponsOnMap, 0, 0, 0, NULL, NULL},
-#ifdef JUBILEE_PHASERS
{1, "use colorful phasers", &colorfulPhasers, 0, 0, 0, NULL, NULL},
-#endif
{1, "highlight friendly phasers", &highlightFriendlyPhasers, 0, 0, 0, NULL, NULL},
{1, "enemy phaser width: %d", &enemyPhasers, 0, 0, 0, NULL, &enPhasRng},
{1, "", &phaserShrinkStyle, 0, 0, 0, shrinkphasermess, NULL},
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- data.c 9 Jun 2009 00:16:36 -0000 1.128
+++ data.c 9 Jun 2009 00:28:10 -0000 1.129
@@ -499,10 +499,7 @@
int showMySpeed = 1;
int showOtherSpeed = 1;
-
-#ifdef JUBILEE_PHASERS
int colorfulPhasers = 0;
-#endif
/* tried to automate this as much as possible... the entries are * the
* character, string identifier, and the default macro for * each distress