diff options
| author | cracker64 <cracker642@gmail.com> | 2011-09-19 21:02:04 (GMT) |
|---|---|---|
| committer | cracker64 <cracker642@gmail.com> | 2011-09-19 21:02:04 (GMT) |
| commit | f0379c5418fd97632004027aa311c4f9b3fb9ab0 (patch) | |
| tree | 92cf624eeb08a6cd317b2b5c40fab3332cb004d7 /includes | |
| parent | fb1a522cca4d3f065d9d2af525bc872c73798a4d (diff) | |
| download | powder-f0379c5418fd97632004027aa311c4f9b3fb9ab0.zip powder-f0379c5418fd97632004027aa311c4f9b3fb9ab0.tar.gz | |
Tool menu in deco editor, Lighten/Darken tools.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/graphics.h | 10 | ||||
| -rw-r--r-- | includes/interface.h | 16 |
2 files changed, 21 insertions, 5 deletions
diff --git a/includes/graphics.h b/includes/graphics.h index c5a261d..24d1ffe 100644 --- a/includes/graphics.h +++ b/includes/graphics.h @@ -134,11 +134,15 @@ void draw_parts(pixel *vid); void draw_walls(pixel *vid); -void create_decorations(int x, int y, int rx, int ry, int r, int g, int b, int click); +void create_decorations(int x, int y, int rx, int ry, int r, int g, int b, int click, int tool); -void line_decorations(int x1, int y1, int x2, int y2, int rx, int ry, int r, int g, int b, int click); +void create_decoration(int x, int y, int r, int g, int b, int click, int tool); -void box_decorations(int x1, int y1, int x2, int y2, int r, int g, int b, int click); +void line_decorations(int x1, int y1, int x2, int y2, int rx, int ry, int r, int g, int b, int click, int tool); + +void box_decorations(int x1, int y1, int x2, int y2, int r, int g, int b, int click, int tool); + +void draw_color_menu(pixel *vid_buf, int i, int hover); void draw_wavelengths(pixel *vid, int x, int y, int h, int wl); diff --git a/includes/interface.h b/includes/interface.h index 8beea20..96abd3b 100644 --- a/includes/interface.h +++ b/includes/interface.h @@ -60,9 +60,10 @@ static menu_section msections[] = //doshow does not do anything currently. static menu_section colorsections[] = //doshow does not do anything currently. { - {"\xD1", "Colors", 7, 1}, - {"\xC5", "Tools", 0, 1}, + {"\xC4", "Colors", 7, 1}, + {"\xD7", "Tools", 0, 1}, }; +#define DECO_SECTIONS 2 static menu_wall colorlist[] = { @@ -75,6 +76,17 @@ static menu_wall colorlist[] = {PIXPACK(0xFFFFFF), "White"}, }; +#define DECO_DRAW 0 +#define DECO_LIGHTEN 1 +#define DECO_DARKEN 2 + +static menu_wall toollist[] = +{ + {PIXPACK(0xFF0000), "Draw"}, + {PIXPACK(0xDDDDDD), "Lighten"}, + {PIXPACK(0x111111), "Darken"}, +}; + struct ui_edit { int x, y, w, nx, h; |
