summaryrefslogtreecommitdiffstats
path: root/planner.c
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2013-03-26 22:50:48 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-03-26 19:30:38 -0700
commitc083ec45a9f9a11bc29d1ad17a7c8316cd165a90 (patch)
treeca063c57261e61b522ea6bd02fa71ef1de53354f /planner.c
parent2a6fded3b75115d9400ed6db198919c1e5aa9d0b (diff)
downloadsubsurface-c083ec45a9f9a11bc29d1ad17a7c8316cd165a90.tar.gz
Make relative times default in planner 2
In planning you usually plan lengths of segments rather than runtimes to leave a level. This patch superseeds a previous one with a similar name and (even more) broken spacing. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'planner.c')
-rw-r--r--planner.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/planner.c b/planner.c
index 012a23aca..68f444882 100644
--- a/planner.c
+++ b/planner.c
@@ -832,12 +832,17 @@ static int validate_time(const char *text, int *sec_p, int *rel_p)
while (g_ascii_isspace(*text))
text++;
- rel = 0;
+ rel = 1;
if (*text == '+') {
rel = 1;
text++;
while (g_ascii_isspace(*text))
text++;
+ } else if (*text == '@') {
+ rel = 0;
+ text++;
+ while (g_ascii_isspace(*text))
+ text++;
}
min = strtol(text, &end, 10);
@@ -1269,7 +1274,7 @@ void input_plan()
char *explanationtext = _("<small>Add segments below.\nEach line describes part of the planned dive.\n"
"An entry with depth, time and gas describes a segment that ends "
"at the given depth, takes the given time (if relative, e.g. '+3:30') "
- "or ends at the given time (if absolute), and uses the given gas.\n"
+ "or ends at the given time (if absolute e.g '@5:00', 'runtime'), and uses the given gas.\n"
"An empty gas means 'use previous gas' (or AIR if no gas was specified).\n"
"An entry that has a depth and a gas given but no time is special; it "
"informs the planner that the gas specified is available for the ascent "