mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-07 20:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use get_o2 instead of local version

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-05-14 00:32:46 +02:00 • committed by Dirk Hohndel
parent 05d9cc409c
commit 0f0ddf86fe
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
divelist.c
View file

@ -152,12 +152,9 @@ int total_weight(struct dive *dive)
static int active_o2(struct dive *dive, struct divecomputer *dc, duration_t time) 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; struct event *event;
if (!o2permille)
o2permille = O2_IN_AIR;
for (event = dc->events; event; event = event->next) { for (event = dc->events; event; event = event->next) {
if (event->time.seconds > time.seconds) if (event->time.seconds > time.seconds)
break; break;