diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-27 23:04:24 +0100 |
|---|---|---|
| committer |  Robert C. Helling <helling@atdotde.de> | 2020-11-24 10:54:10 +0100 |
| commit | b36178a00a37f3679decebb52fffe6e41e5c5704 (patch) | |
| tree | 6a7997c041dd28d2033b84def68968c69bf8b402 /core/dive.c | |
| parent | e47b812fd07e8652dd65795510ff13c5657d4baf (diff) | |
| download | subsurface-b36178a00a37f3679decebb52fffe6e41e5c5704.tar.gz | |
cylindermodel: remove in_planner() use
in_planner() is problematic, since it is uses desktop-only
application state. Since the cylinder-model already has
an appropriate inPlanner flag, use this instead.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/dive.c')
| -rw-r--r-- | core/dive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/dive.c b/core/dive.c index 6ac70da71..5157afea0 100644 --- a/core/dive.c +++ b/core/dive.c @@ -3118,10 +3118,10 @@ void split_divecomputer(const struct dive *src, int num, struct dive **out1, str } //Calculate O2 in best mix -fraction_t best_o2(depth_t depth, const struct dive *dive) +fraction_t best_o2(depth_t depth, const struct dive *dive, bool in_planner) { fraction_t fo2; - int po2 = in_planner() ? prefs.bottompo2 : prefs.modpO2 * 1000; + int po2 = in_planner ? prefs.bottompo2 : prefs.modpO2 * 1000; fo2.permille = (po2 * 100 / depth_to_mbar(depth.mm, dive)) * 10; //use integer arithmetic to round down to nearest percent // Don't permit >100% O2 |