diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2015-01-11 00:01:15 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-01-10 17:27:25 -0800 |
| commit | e219bc70f863eaaa9b81ba5abc240975a128c904 (patch) | |
| tree | 682d6d981929420bbabd0021e02db3006c72d96f /planner.c | |
| parent | bfe05b43407c419a32548af20f40e2b9e3bca045 (diff) | |
| download | subsurface-e219bc70f863eaaa9b81ba5abc240975a128c904.tar.gz | |
Refactor dctype -> divemode
... and repair a failed rebase (sorry).
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -251,7 +251,7 @@ static void create_dive_from_plan(struct diveplan *diveplan, bool track_gas) int oldpo2 = 0; int lasttime = 0; int lastdepth = 0; - enum dive_comp_type type = displayed_dive.dc.dctype; + enum dive_comp_type type = displayed_dive.dc.divemode; if (!diveplan || !diveplan->dp) return; @@ -346,7 +346,7 @@ static void create_dive_from_plan(struct diveplan *diveplan, bool track_gas) finish_sample(dc); dp = dp->next; } - dc->dctype = type; + dc->divemode = type; #if DEBUG_PLAN & 32 save_dive(stdout, &displayed_dive); #endif @@ -699,7 +699,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool snprintf(temp, sizeof(temp), "%s", translate("gettextFromC", "OTU")); len += snprintf(buffer + len, sizeof(buffer) - len, "<br>%s: %i</div>", temp, dive->otu); - if (dive->dc.dctype == CCR) + if (dive->dc.divemode == CCR) snprintf(temp, sizeof(temp), "%s", translate("gettextFromC", "Gas consumption (CCR legs excluded):")); else snprintf(temp, sizeof(temp), "%s", translate("gettextFromC", "Gas consumption:")); |