mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: replace dive master by dive guide
In general, replace "dive master" by "dive guide". However, do not change written dive logs for now. On reading, accept both versions. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
889827aadb
commit
9e0712d5dc
38 changed files with 141 additions and 133 deletions
|
@ -25,7 +25,7 @@ struct DiveField {
|
|||
unsigned int water_temp : 1;
|
||||
unsigned int atm_press : 1;
|
||||
unsigned int divesite : 1;
|
||||
unsigned int divemaster : 1;
|
||||
unsigned int diveguide : 1;
|
||||
unsigned int buddy : 1;
|
||||
unsigned int rating : 1;
|
||||
unsigned int visibility : 1;
|
||||
|
@ -49,7 +49,7 @@ struct DiveField {
|
|||
WATER_TEMP = 1 << 5,
|
||||
ATM_PRESS = 1 << 6,
|
||||
DIVESITE = 1 << 7,
|
||||
DIVEMASTER = 1 << 8,
|
||||
DIVEGUIDE = 1 << 8,
|
||||
BUDDY = 1 << 9,
|
||||
RATING = 1 << 10,
|
||||
VISIBILITY = 1 << 11,
|
||||
|
@ -159,7 +159,7 @@ inline DiveField::DiveField(int flags) :
|
|||
water_temp((flags & WATER_TEMP) != 0),
|
||||
atm_press((flags & ATM_PRESS) != 0),
|
||||
divesite((flags & DIVESITE) != 0),
|
||||
divemaster((flags & DIVEMASTER) != 0),
|
||||
diveguide((flags & DIVEGUIDE) != 0),
|
||||
buddy((flags & BUDDY) != 0),
|
||||
rating((flags & RATING) != 0),
|
||||
visibility((flags & VISIBILITY) != 0),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue