summaryrefslogtreecommitdiffstats
path: root/dive.h
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-23 18:38:45 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-23 21:33:19 -0700
commitecbcd4db4721c9e4a6b4253a5f45f43fa9e80fc7 (patch)
tree7074fbf17e3fbe467a11a0613737c423e9f92926 /dive.h
parent641db88a2c6b50ccbb2df1546de42b779541bf0c (diff)
downloadsubsurface-ecbcd4db4721c9e4a6b4253a5f45f43fa9e80fc7.tar.gz
Enable the weightsystem info and move the declarations to dive.h
Having the tank_info declared in models.cpp seemed unintuitive. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.h')
-rw-r--r--dive.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/dive.h b/dive.h
index a1febdd16..70459f931 100644
--- a/dive.h
+++ b/dive.h
@@ -726,9 +726,9 @@ void get_gas_string(int o2, int he, char *buf, int len);
struct event *get_next_event(struct event *event, char *name);
-/* this struct holds the information that
- * describes the cylinders of air.
- * it is a global variable initialized in equipment.c
+/* these structs holds the information that
+ * describes the cylinders / weight systems.
+ * they are global variables initialized in equipment.c
* used to fill the combobox in the add/edit cylinder
* dialog
*/
@@ -737,6 +737,13 @@ struct tank_info {
const char *name;
int cuft, ml, psi, bar;
};
+extern struct tank_info tank_info[100];
+
+struct ws_info {
+ const char *name;
+ int grams;
+};
+extern struct ws_info ws_info[100];
extern bool cylinder_nodata(cylinder_t *cyl);
extern bool cylinder_none(void *_data);