diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-03-11 08:38:24 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-03-11 08:38:24 -0800 |
| commit | b8b858a9d299877969527ef5b3c4bde97bb86d05 (patch) | |
| tree | 14a289853593b7abd8ea9bb151b6d9ba1b5c6820 | |
| parent | 87612477223c5a7cc8c93210bf80cc7599dee17c (diff) | |
| download | subsurface-b8b858a9d299877969527ef5b3c4bde97bb86d05.tar.gz | |
Fix build after merges
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | core/planner.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/planner.c b/core/planner.c index 03f33d1b9..c27b4cac4 100644 --- a/core/planner.c +++ b/core/planner.c @@ -648,7 +648,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool } else { secondlastdecostop = decostoplevels_imperial[2]; } - if (dp->entered && !nextdp->entered && dp->depth > secondlastdecostop) + if (dp->entered && !nextdp->entered && dp->depth.mm > secondlastdecostop) lastbottomdp = dp; len = strlen(buffer); @@ -900,7 +900,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool /* Calculate minimum gas volume. */ volume_t mingasv; mingasv.mliter = prefs.problemsolvingtime * prefs.bottomsac * prefs.sacfactor / 100.0 - * depth_to_bar(lastbottomdp->depth, dive) + * depth_to_bar(lastbottomdp->depth.mm, dive) + cyl->deco_gas_used.mliter * prefs.sacfactor / 100.0; /* Calculate minimum gas pressure for cyclinder. */ pressure_t mingasp; @@ -909,7 +909,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool /* Translate all results into correct units */ mingas_volume = get_volume_units(mingasv.mliter, NULL, &unit); mingas_pressure = get_pressure_units(mingasp.mbar, &pressure_unit); - mingas_depth = get_depth_units(lastbottomdp->depth, NULL, &depth_unit); + mingas_depth = get_depth_units(lastbottomdp->depth.mm, NULL, &depth_unit); /* Print it to results */ if (cyl->start.mbar > mingasp.mbar) snprintf(mingas, sizeof(mingas), translate("gettextFromC", "<br> — <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s"), |