Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17400/src
Modified Files:
data.c defaults.c option.c
Log Message:
New Hockey options menu.
5 new netrekrc options, not functional yet but these patches include all
the backend work for loading/changing/documenting the new options.
The options are headingTic, tractorID, lockLine, weaponsOnMap, and
sortPlanets
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- defaults.c 15 Mar 2007 15:39:27 -0000 1.57
+++ defaults.c 15 Mar 2007 16:42:30 -0000 1.58
@@ -198,6 +198,12 @@
NULL
}
},
+ {"headingTic", &headingTic, RC_BOOL,
+ {
+ "Draw a tic mark indicating your ship's direction",
+ NULL
+ }
+ },
{"highlightFriendlyPhasers", &highlightFriendlyPhasers, RC_BOOL,
{
"Highlight friendly phasers",
@@ -222,6 +228,13 @@
NULL
}
},
+ {"lockLine", &lockLine, RC_BOOL,
+ {
+ "Draw dashed green line on map from your ship to lock target,"
+ "requires showLock to be on for map",
+ NULL
+ }
+ },
{"logging", &logging, RC_BOOL,
{
"Log all messages to file. Requires \"logfile\" option",
@@ -689,6 +702,12 @@
NULL
}
},
+ {"sortPlanets", &sortPlanets, RC_BOOL,
+ {
+ "Sort the planet list by team and army count",
+ NULL
+ }
+ },
{"sortPlayers", &sortPlayers, RC_BOOL,
{
"Sort players by team",
@@ -758,6 +777,12 @@
NULL
}
},
+ {"tractorID", &tractorID, RC_BOOL,
+ {
+ "Show the ID of player you are tractoring as a number below your ship",
+ NULL
+ }
+ },
#ifdef SHORT_PACKETS
{"tryShort", &tryShort, RC_BOOL,
{
@@ -880,6 +905,12 @@
NULL
}
},
+ {"weaponsOnMap", &weaponsOnMap, RC_BOOL,
+ {
+ "Show phasers, torps and plasmas on galactic map",
+ NULL
+ }
+ },
{"windowMove", &windowMove, RC_BOOL,
{
"Enable internal windows moving",
@@ -1575,6 +1606,11 @@
soundMusicBkgd = booleanDefault ("soundMusicBkgd", soundMusicBkgd);
soundAngles = booleanDefault ("soundAngles", soundAngles);
useFullShipInfo = booleanDefault ("useFullShipInfo", useFullShipInfo);
+ headingTic = booleanDefault ("headingTic", headingTic);
+ tractorID = booleanDefault ("tractorID", tractorID);
+ lockLine = booleanDefault ("lockLine", lockLine);
+ weaponsOnMap = booleanDefault ("weaponsOnMap", weaponsOnMap);
+ sortPlanets = booleanDefault ("sortPlanets", sortPlanets);
tpDotDist = intDefault ("tpDotDist", tpDotDist);
omitTeamLetter = booleanDefault ("omitTeamLetter", omitTeamLetter);
beepOnPrivateMessage = booleanDefault ("beepOnPrivateMessage", beepOnPrivateMessage);
Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- option.c 15 Mar 2007 15:39:27 -0000 1.34
+++ option.c 15 Mar 2007 16:42:30 -0000 1.35
@@ -263,7 +263,8 @@
#endif
{1, "highlight friendly phasers", &highlightFriendlyPhasers, 0, 0, 0, NULL, NULL},
{1, "show tractor/pressor beams", &showTractorPressor, 0, 0, 0, NULL, NULL},
- {1, "show tractors after lock ", &continueTractor, 0, 0, 0, NULL, NULL},
+ {1, "show tractors after lock", &continueTractor, 0, 0, 0, NULL, NULL},
+ {1, "show tractor target ID", &tractorID, 0, 0, 0, NULL, NULL},
{1, "show all players tract/press", &showAllTractorPressor, 0, 0, 0, NULL, NULL},
{1, "enemy phaser width: %d", &enemyPhasers, 0, 0, 0, NULL, &enPhasRng},
{1, "", &phaserShrinkStyle, 0, 0, 0, shrinkphasermess, NULL},
@@ -271,11 +272,9 @@
{1, "shrink their phasers by %d/16", &theirPhaserShrink, 0, 0, 0, NULL, &phaserShrinkRng},
{1, "shrink phasers on a miss", &shrinkPhaserOnMiss, 0, 0, 0, NULL, NULL},
{1, "report kills", &reportKills, 0, 0, 0, NULL, NULL},
+ {1, "show heading tic mark", &headingTic, 0, 0, 0, NULL, NULL},
+ {1, "show lock line", &lockLine, 0, 0, 0, NULL, NULL},
{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", ¬done, 0, 0, 0, NULL, NULL},
{-1, NULL, 0, 0, 0, 0, NULL, NULL}
};
@@ -289,6 +288,7 @@
{1, "rotate new planets", &rotatePlanets, 0, 0, 0, NULL, NULL},
{1, "show planet names on local", &showPlanetNames, 0, 0, 0, NULL, NULL},
{1, "show army count on orbit", &showArmy, 0, 0, 0, NULL, NULL},
+ {1, "show weapons on galactic", &weaponsOnMap, 0, 0, 0, NULL, NULL},
{1, "show owner on galactic", &showPlanetOwner, 0, 0, 0, NULL, NULL},
{1, "show IND planets", &showIND, 0, 0, 0, NULL, NULL},
{1, "show AGRI in caps on map", &agriCAPS, 0, 0, 0, NULL, NULL},
@@ -298,6 +298,7 @@
{1, "autorotate galaxy", &autoRotate, 0, 0, 0, NULL, NULL},
{1, "", &rotate, 0, 0, 0, rotatemess, NULL},
#endif
+ {1, "sort the planetlist window", &sortPlanets, 0, 0, 0, NULL, NULL},
{1, "done", ¬done, 0, 0, 0, NULL, NULL},
{-1, NULL, 0, 0, 0, 0, NULL, NULL}
};
@@ -389,11 +390,6 @@
{1, "draw view box on map", &viewBox, 0, 0, 0, NULL, NULL},
{1, "draw stars on local", &showStars, 0, 0, 0, NULL, NULL},
{1, "draw warp streaks", &warpStreaks, 0, 0, 0, NULL, NULL},
-#ifdef HOCKEY_LINES
- {1, "show hockey lines on local", &showHockeyLinesLocal, 0, 0, 0, NULL, NULL},
- {1, "show hockey lines on map", &showHockeyLinesMap, 0, 0, 0, NULL, NULL},
- {1, "show hockey score on map", &showHockeyScore, 0, 0, 0, NULL, NULL},
-#endif
{1, "alert on extra border(s)", &extraAlertBorder, 0, 0, 0, NULL, NULL},
#ifdef PHASER_STATS
{1, "", &phaserStats, 0, 0, 0, phaserstatmess, NULL},
@@ -406,6 +402,20 @@
{-1, NULL, 0, 0, 0, 0, NULL, NULL}
};
+struct option Hockey_Menu[] = {
+ {0, "Hockey Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
+ {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
+#ifdef HOCKEY_LINES
+ {1, "show puck circle", &puckCircle, 0, 0, 0, NULL, NULL},
+ {1, "show puck arrow", &puckArrow, 0, 0, 0, NULL, NULL},
+ {1, "show hockey lines on local", &showHockeyLinesLocal, 0, 0, 0, NULL, NULL},
+ {1, "show hockey lines on map", &showHockeyLinesMap, 0, 0, 0, NULL, NULL},
+ {1, "show hockey score on map", &showHockeyScore, 0, 0, 0, NULL, NULL},
+#endif
+ {1, "done", ¬done, 0, 0, 0, NULL, NULL},
+ {-1, NULL, 0, 0, 0, 0, NULL, NULL}
+};
+
struct option Save_Menu[] = {
{0, "Save Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
{1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
@@ -1018,6 +1028,7 @@
AddOptMenu (Visual_Menu, 0);
AddOptMenu (Window_Menu, 0);
AddOptMenu (Playerlist_Menu, 0);
+ AddOptMenu (Hockey_Menu, 0);
AddOptMenu (Save_Menu, 0);
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- data.c 15 Mar 2007 15:39:27 -0000 1.65
+++ data.c 15 Mar 2007 16:42:29 -0000 1.66
@@ -808,4 +808,9 @@
int soundMusicBkgd = 0; /* Play random background music continuously */
int soundAngles = 0; /* Use 3D sound */
-int useFullShipInfo = 1; /* Prefer SP_PLAYER packets over SP_S_PLAYER packets */
\ No newline at end of file
+int useFullShipInfo = 1; /* Prefer SP_PLAYER packets over SP_S_PLAYER packets */
+int headingTic = 1; /* show ship heading tic */
+int tractorID = 1; /* show ID of player you are tractoring */
+int lockLine = 1; /* draw dashed line on map from you to lock target */
+int weaponsOnMap = 1; /* draw weapons fire on map */
+int sortPlanets = 1; /* sort planet list by team and army count */