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

Merge branch 'atdotde'

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	qt-ui/diveplanner.cpp
	qt-ui/models.cpp
This commit is contained in:
Dirk Hohndel 2014-05-26 08:23:22 -07:00
commit cfe865dd0c
4 changed files with 48 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dive.h
View file

@ -91,6 +91,9 @@ static inline int get_he(const struct gasmix *mix)
return mix->he.permille;
}
extern void sanitize_gasmix(struct gasmix *mix);
extern int gasmix_distance(const struct gasmix *a, const struct gasmix *b);
static inline bool is_air(int o2, int he)
{
return (he == 0) && (o2 == 0 || ((o2 >= O2_IN_AIR - 1) && (o2 <= O2_IN_AIR + 1)));