Update of /cvsroot/netrek/client/netrekxp/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28304/src
Modified Files:
data.c defaults.c feature.c input.c option.c
Log Message:
Revert useAllFeatures, return to previous code.
Remove autoPhaser use option, ifdef out autophaser
code.
Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- input.c 21 May 2009 02:37:28 -0000 1.48
+++ input.c 22 May 2009 04:08:45 -0000 1.49
@@ -1928,6 +1928,7 @@
int targtype),
*target;
+#if DEBUG
if (autoPhaser) /* add range check here */ {
target = gettarget (data->Window, data->x, data->y, TARG_ENEMY | TARG_CLOAK);
if (target->o_num == -1) { /* failed to find a target */
@@ -1951,6 +1952,7 @@
course = (unsigned char) (getcourse (data->Window, x, y));
}
else
+#endif
course = (unsigned char) (getcourse (data->Window, data->x, data->y));
sendPhaserReq (course);
}
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- data.c 21 May 2009 02:37:28 -0000 1.119
+++ data.c 22 May 2009 04:08:45 -0000 1.120
@@ -925,6 +925,5 @@
int fullBitmapRotation = 1; /* draw old bitmap sets to all angles */
int hideConsole = 0; /* show console window or not */
int autoPhaser = 1; /* phaser exact location of enemy target closest to cursor */
-int useAllFeatures = 1; /* ignore server settings for info/control feature packets */
struct context *context;
Index: feature.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/feature.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- feature.c 21 May 2009 02:37:28 -0000 1.27
+++ feature.c 22 May 2009 04:08:45 -0000 1.28
@@ -303,9 +303,10 @@
}
}
#endif /* BEEPLITE */
- /* Ignore these feature packets? */
- if (useAllFeatures)
- {
+
+
+#if DEBUG
+ /* Ignore these feature packets? */
motion_mouse_steering = 1;
F_show_army_count = 1;
F_show_other_speed = 1;
@@ -321,7 +322,7 @@
LITE_COLOR |
LITE_TTS;
#endif
- }
+#endif
}
/******************************************************************************/
Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- option.c 21 May 2009 02:37:28 -0000 1.58
+++ option.c 22 May 2009 04:08:45 -0000 1.59
@@ -298,7 +298,6 @@
struct option Weapons_Menu[] = {
{0, "Weapons Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
{1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
- {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
@@ -439,7 +438,6 @@
{1, "", &messageHUD, 0, 0, 0, messagehudmess, &messagehud_range},
#endif
{1, "use double buffering", &doubleBuffering, 0, 0, 0, NULL, NULL},
- {1, "turn on all feature packets", &useAllFeatures, 0, 0, 0, NULL, NULL},
{1, "done", ¬done, 0, 0, 0, NULL, NULL},
{-1, NULL, 0, 0, 0, 0, NULL, NULL}
};
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- defaults.c 21 May 2009 02:37:28 -0000 1.97
+++ defaults.c 22 May 2009 04:08:45 -0000 1.98
@@ -43,13 +43,6 @@
NULL
}
},
- {"autoPhaser", &autoPhaser, RC_INT,
- {
- "Phaser exact location of enemy target closest to cursor",
- "Enemy must be within phaser range of your ship",
- NULL
- }
- },
{"autoQuit", &autoQuit, RC_INT,
{
"Autoquit timer (default 60)",
@@ -914,16 +907,6 @@
NULL
}
},
- {"useAllFeatures", &useAllFeatures, RC_INT,
- {
- "Ignore server settings for info/control feature packets.",
- "This will automatically turn on motion mouse steering",
- "show army counts, show other's speed, show cloakers, turn",
- "keys, visibility range and beeplite regardless of what",
- "features the server requests that you turn off.",
- NULL
- }
- },
{"useCheckPlanets", &useCheckPlanets, RC_BOOL,
{
"Crosscheck with server to make sure all planet information is",