diff options
| author | chaos.powdertoy.co.uk <admin@powdertoy.co.uk> | 2012-03-15 02:14:17 (GMT) |
|---|---|---|
| committer | chaos.powdertoy.co.uk <admin@powdertoy.co.uk> | 2012-03-15 02:14:17 (GMT) |
| commit | 6254d4064dff390ce92c1803cdf9d9fb58a62e79 (patch) | |
| tree | c95626a1f5ea562d7a4dc5c58a02b0db3c902043 /includes/interface.h | |
| parent | 4fc0f750221a33a9ac922022ee58ccda6bbe3440 (diff) | |
| parent | 7a454d4d729a5715a7c1e71dfbaf303471bf8d1f (diff) | |
| download | powder-6254d4064dff390ce92c1803cdf9d9fb58a62e79.zip powder-6254d4064dff390ce92c1803cdf9d9fb58a62e79.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'includes/interface.h')
| -rw-r--r-- | includes/interface.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/interface.h b/includes/interface.h index 34c65a6..2c1a290 100644 --- a/includes/interface.h +++ b/includes/interface.h @@ -77,6 +77,8 @@ static quick_option quickmenu[] = {"P", "Sand effect", QM_TOGGLE, &pretty_powder}, {"G", "Draw gravity grid", QM_TOGGLE, &drawgrav_enable}, {"D", "Show decorations", QM_TOGGLE, &decorations_enable}, + {"N", "Newtonian gravity", QM_TOGGLE, &ngrav_enable}, + {"A", "Ambient heat", QM_TOGGLE, &aheat_enable}, {NULL} }; @@ -101,12 +103,14 @@ static menu_wall colorlist[] = #define DECO_DRAW 0 #define DECO_LIGHTEN 1 #define DECO_DARKEN 2 +#define DECO_SMUDGE 3 static menu_wall toollist[] = { {PIXPACK(0xFF0000), "Draw"}, {PIXPACK(0xDDDDDD), "Lighten"}, {PIXPACK(0x111111), "Darken"}, + {PIXPACK(0x00FF00), "Smudge"}, }; struct ui_edit @@ -289,7 +293,7 @@ int save_filename_ui(pixel *vid_buf); void menu_ui(pixel *vid_buf, int i, int *sl, int *sr); -void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq, int mx, int my); +void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *su, int *dae, int b, int bq, int mx, int my); int color_menu_ui(pixel *vid_buf, int i, int *cr, int *cg, int *cb, int b, int bq, int mx, int my, int * tool); |