mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Refactor dctype -> divemode
... and repair a failed rebase (sorry). Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
bfe05b4340
commit
e219bc70f8
18 changed files with 204 additions and 184 deletions
|
|
@ -308,7 +308,7 @@ bool is_cylinder_used(struct dive *dive, int idx)
|
|||
return true;
|
||||
event = get_next_event(event->next, "gaschange");
|
||||
}
|
||||
if (dc->dctype == CCR && (idx == dive->diluent_cylinder_index || idx == dive->oxygen_cylinder_index))
|
||||
if (dc->divemode == CCR && (idx == dive->diluent_cylinder_index || idx == dive->oxygen_cylinder_index))
|
||||
return true;
|
||||
}
|
||||
if (idx == 0 && !firstGasExplicit)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue