Merge latest with graphicstest

1 files changed, 20 insertions, 2 deletions

diff --git a/includes/interface.h b/includes/interface.h
index 5d59dcf..a8a511e 100644
--- a/includes/interface.h
+++ b/includes/interface.h
@@ -15,6 +15,17 @@ struct menu_section
 };
 typedef struct menu_section menu_section;
 
+#define QM_TOGGLE	1
+
+struct quick_option
+{
+	char *icon;
+	const char *name;
+	int type;
+	int *variable;
+};
+typedef struct quick_option quick_option;
+
 struct menu_wall
 {
 	pixel colour;
@@ -58,6 +69,13 @@ static menu_section msections[] = //doshow does not do anything currently.
 	{"\xC8", "Cracker!", 0, 0},
 };
 
+static quick_option quickmenu[] = //doshow does not do anything currently.
+{
+	{"P", "Sand effect", QM_TOGGLE, &pretty_powder},
+	{"G", "Draw gravity grid", QM_TOGGLE, &drawgrav_enable},
+	{NULL}
+};
+
 static menu_section colorsections[] = //doshow does not do anything currently.
 {
 	{"\xC4", "Colors", 7, 1},
@@ -201,10 +219,10 @@ extern int zoom_en;
 extern int zoom_x, zoom_y;
 extern int zoom_wx, zoom_wy;
 
-extern int drawgrav_enable;
-
 void menu_count(void);
 
+void quickoptions_menu(pixel *vid_buf, int b, int bq, int x, int y);
+
 void prop_edit_ui(pixel *vid_buf, int x, int y);
 
 void get_sign_pos(int i, int *x0, int *y0, int *w, int *h);