X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=65337303a05d893e7e894ac764ff46a444c0ab61;hb=89593a542aaf0554cceda7f92ad51e9df7e4cbde;hp=c6c545dcc11e133a748113f8529fce9a5128aeb6;hpb=b176daf6d6d169bfa9b811687bd7696b1bb6063f;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index c6c545d..6533730 100644
--- a/dive.h
+++ b/dive.h
@@ -75,11 +75,13 @@ typedef struct {
 typedef struct {
 	volume_t size;
 	pressure_t workingpressure;
+	const char *description;	/* "LP85", "AL72", "AL80", "HP100+" or whatever */
 } cylinder_type_t;
 
 typedef struct {
 	cylinder_type_t type;
 	gasmix_t gasmix;
+	pressure_t start, end;
 } cylinder_t;
 
 static inline int to_feet(depth_t depth)
@@ -107,10 +109,9 @@ struct sample {
 	int cylinderindex;
 };
 
-#define MAX_CYLINDERS (4)
+#define MAX_CYLINDERS (8)
 
 struct dive {
-	const char *name;
 	time_t when;
 	char *location;
 	char *notes;
@@ -118,7 +119,6 @@ struct dive {
 	duration_t duration, surfacetime;
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
-	pressure_t beginning_pressure, end_pressure;
 	cylinder_t cylinder[MAX_CYLINDERS];
 	int samples;
 	struct sample sample[];