summaryrefslogtreecommitdiffstats
path: root/divelist.c
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2014-05-14 00:32:46 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-05-20 11:51:46 +0900
commit0f0ddf86fef95db08ea84c987352d26aea08b0fc (patch)
treee94ca21b996b3c78e174ca9e5845b6a83c425a70 /divelist.c
parent05d9cc409c7ddffcd981c0dafaf67ba6935cc0ba (diff)
downloadsubsurface-0f0ddf86fef95db08ea84c987352d26aea08b0fc.tar.gz
Use get_o2 instead of local version
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'divelist.c')
-rw-r--r--divelist.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/divelist.c b/divelist.c
index 42e06abbd..1daf0f5ac 100644
--- a/divelist.c
+++ b/divelist.c
@@ -152,12 +152,9 @@ int total_weight(struct dive *dive)
static int active_o2(struct dive *dive, struct divecomputer *dc, duration_t time)
{
- int o2permille = dive->cylinder[0].gasmix.o2.permille;
+ int o2permille = get_o2(&dive->cylinder[0].gasmix);
struct event *event;
- if (!o2permille)
- o2permille = O2_IN_AIR;
-
for (event = dc->events; event; event = event->next) {
if (event->time.seconds > time.seconds)
break;