mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use get_o2() and get_he() instead of accessing permilles directly

Browse source 
This gets rid of problems with air.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2014-05-25 18:01:16 +02:00 • committed by Dirk Hohndel
parent c86d055db7
commit 04b6b6aaf9
5 changed files with 53 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dive.c
View file

@ -488,7 +488,7 @@ static int same_rounded_pressure(pressure_t a, pressure_t b)
return abs(a.mbar - b.mbar) <= 500;
}
static void sanitize_gasmix(struct gasmix *mix)
void sanitize_gasmix(struct gasmix *mix)
{
unsigned int o2, he;
@ -1218,7 +1218,7 @@ static void merge_weightsystem_info(weightsystem_t *res, weightsystem_t *a, weig
*res = *a;
}
static int gasmix_distance(const struct gasmix *a, const struct gasmix *b)
int gasmix_distance(const struct gasmix *a, const struct gasmix *b)
{
int a_o2 = get_o2(a), b_o2 = get_o2(b);
int a_he = get_he(a), b_he = get_he(b);