X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=dive.c;h=f5d0828015e2b64990a390d877839e43335ffd48;hp=a420a3ef638927cd39c60ffe69f5fa37a9bbfea3;hb=e8ec3df371f0496a52ebdc463245d7b9df3be6ff;hpb=3c542b5a418751f22511f6b1d554252c6e472a43 diff --git a/dive.c b/dive.c index a420a3e..f5d0828 100644 --- a/dive.c +++ b/dive.c @@ -486,6 +486,7 @@ struct dive *fixup_dive(struct dive *dive) add_people(dive->buddy); add_people(dive->divemaster); add_location(dive->location); + add_suit(dive->suit); for (i = 0; i < MAX_CYLINDERS; i++) { cylinder_t *cyl = dive->cylinder + i; add_cylinder_description(&cyl->type); @@ -703,6 +704,7 @@ struct dive *try_to_merge(struct dive *a, struct dive *b) MERGE_TXT(res, a, b, buddy); MERGE_TXT(res, a, b, divemaster); MERGE_MAX(res, a, b, rating); + MERGE_TXT(res, a, b, suit); MERGE_MAX(res, a, b, number); MERGE_MAX(res, a, b, maxdepth.mm); res->meandepth.mm = 0;