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

Revert "In statistics, ignore gas use of planned dives"

Browse source 
This reverts commit 1d8662006c.

Mistakenly pushed to master

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-02-03 07:31:03 -08:00
parent 414d7f2632
commit 08c42813e5
8 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/dive.c
View file

@ -582,7 +582,7 @@ void copy_cylinders(struct dive *s, struct dive *d, bool used_only)
memset(&d->cylinder[i], 0, sizeof(cylinder_t));
}
for (i = j = 0; i < MAX_CYLINDERS; i++) {
if (!used_only || is_cylinder_used(s, i, false)) {
if (!used_only || is_cylinder_used(s, i)) {
d->cylinder[j].type = s->cylinder[i].type;
d->cylinder[j].type.description = copy_string(s->cylinder[i].type.description);
d->cylinder[j].gasmix = s->cylinder[i].gasmix;
@ -2050,10 +2050,10 @@ static void merge_cylinders(struct dive *res, struct dive *a, struct dive *b)
} else {
int j=0;
for (i = 0; i < MAX_CYLINDERS && j < MAX_CYLINDERS; i++) {
if (is_cylinder_used(res, i, false))
if (is_cylinder_used(res, i))
continue;
while (!is_cylinder_used(b, j, false) && j < MAX_CYLINDERS - 1) {
while (!is_cylinder_used(b, j) && j < MAX_CYLINDERS - 1) {
mapping[j] = 0;
++j;
}