diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-11-18 11:15:32 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-11-20 08:14:54 -0800 |
| commit | 6bf4120dbbf7be1b9267e0e86f3948b77870ea71 (patch) | |
| tree | 3282a26502c1a91ae63ceca450b82b11f5be4e78 /core/dive.c | |
| parent | 3b9e0b59311908f6cbc099f3b7fd5294fd5d0d30 (diff) | |
| download | subsurface-6bf4120dbbf7be1b9267e0e86f3948b77870ea71.tar.gz | |
Core: replace tripflag by notrip boolean
The only remaining use of the tripflag was to mark dives that
were removed explicitly from a trip, i.e. shouldn't be autogrouped.
Therefore replace the enum by a simple boolean.
Currently, there is no way of unsetting the notrip flag. But this
shouldn't result in a user-visible change.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/dive.c')
| -rw-r--r-- | core/dive.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/dive.c b/core/dive.c index 22f88d43f..47143aaa3 100644 --- a/core/dive.c +++ b/core/dive.c @@ -2564,10 +2564,9 @@ static void merge_temperatures(struct dive *res, const struct dive *a, const str */ static void pick_trip(struct dive *res, const struct dive *pick) { - tripflag_t tripflag = pick->tripflag; dive_trip_t *trip = pick->divetrip; - res->tripflag = tripflag; + res->notrip = pick->notrip; add_dive_to_trip(res, trip); } |