Planner: only copy cylinders that were used in the template dive

This was only semi-implemented the first time around. Now we really only
copy the ones that are indeed used.

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

1 files changed, 5 insertions, 2 deletions

diff --git a/dive.c b/dive.c
index 145a01883..00c08ed2d 100644
--- a/dive.c
+++ b/dive.c
@@ -308,13 +308,16 @@ int nr_weightsystems(struct dive *dive)
 	return nr;
 }
 
-void copy_cylinders(struct dive *s, struct dive *d)
+void copy_cylinders(struct dive *s, struct dive *d, bool used_only)
 {
 	int i;
 	if (!s || !d)
 		return;
 	for (i = 0; i < MAX_CYLINDERS; i++)
-		d->cylinder[i] = s->cylinder[i];
+		if (!used_only || cylinder_is_used(s, &s->cylinder[i]))
+			d->cylinder[i] = s->cylinder[i];
+		else
+			memset(&d->cylinder[i], 0, sizeof(cylinder_t));
 }
 
 void copy_samples(struct dive *s, struct dive *d)