diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2014-07-18 08:39:53 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-07-18 10:14:27 -0700 |
| commit | 345b01750a83229a331c91bdebb1cdf7730fdac1 (patch) | |
| tree | d2397d198538c1bc72c1477337a479832042ce52 | |
| parent | 7806dbbd9edd429a82bed5d98f8750db0900d83a (diff) | |
| download | subsurface-345b01750a83229a331c91bdebb1cdf7730fdac1.tar.gz | |
Use get_gas_at_time in active_o2
active_o2 is now just a wrapper to return the o2 part of the active gas at
a certain time.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | divelist.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/divelist.c b/divelist.c index c9e5aebf7..2abeac9ca 100644 --- a/divelist.c +++ b/divelist.c @@ -42,6 +42,7 @@ #include "dive.h" #include "divelist.h" #include "display.h" +#include "planner.h" static short dive_list_changed = false; @@ -152,17 +153,9 @@ int total_weight(struct dive *dive) static int active_o2(struct dive *dive, struct divecomputer *dc, duration_t time) { - int o2permille = get_o2(&dive->cylinder[0].gasmix); - struct event *event; - - for (event = dc->events; event; event = event->next) { - if (event->time.seconds > time.seconds) - break; - if (strcmp(event->name, "gaschange")) - continue; - o2permille = get_o2(get_gasmix_from_event(event)); - } - return o2permille; + struct gasmix gas = dive->cylinder[0].gasmix; + get_gas_at_time(dive, dc, time, &gas); + return get_o2(&gas); } /* calculate OTU for a dive - this only takes the first divecomputer into account */ |