diff options
| -rw-r--r-- | core/dive.c | 1 | ||||
| -rw-r--r-- | core/dive.h | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/core/dive.c b/core/dive.c index 66f05b0b3..f296a8486 100644 --- a/core/dive.c +++ b/core/dive.c @@ -250,7 +250,6 @@ struct event *get_next_divemodechange(struct event **evd) while (ev) { // Step through the events. for (int i=0; i<3; i++) { // For each event name search for one of the above strings if (!strcmp(ev->name,divemode_text[i])) { // if the event name is one of the divemode names - ev->type = DIVEMODECHANGE_EVENTTYPE + i; ev->divemode = i; // set the event type to the dive mode *evd = ev->next; return (ev); diff --git a/core/dive.h b/core/dive.h index dc204b1d6..c46b9d64a 100644 --- a/core/dive.h +++ b/core/dive.h @@ -83,16 +83,14 @@ struct event { /* This is the annoying libdivecomputer format. */ int flags, value; /* .. and this is our "extended" data for some event types */ - enum dive_comp_type divemode; union { + enum dive_comp_type divemode; // for divemode change events /* - * Currently only for gas switch events. - * * NOTE! The index may be -1, which means "unknown". In that * case, the get_cylinder_index() function will give the best * match with the cylinders in the dive based on gasmix. */ - struct { + struct { // for gas switch events int index; struct gasmix mix; } gas; |