diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-05-21 12:27:19 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-05-24 13:49:08 (GMT) |
| commit | ee39c061525e027adcf61379d9d28151ac96599a (patch) | |
| tree | 49ffcd1fc7126f2f4e0fc253a9d07040005b609d /src/main.c | |
| parent | fc4de9640cedaaf73e3f43610492be8d92313929 (diff) | |
| download | powder-ee39c061525e027adcf61379d9d28151ac96599a.zip powder-ee39c061525e027adcf61379d9d28151ac96599a.tar.gz | |
Decorations toggle and brush size keys
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -173,6 +173,7 @@ int sys_pause = 0; int sys_shortcuts = 1; int legacy_enable = 0; //Used to disable new features such as heat, will be set by save. int ngrav_enable = 0; //Newtonian gravity, will be set by save +int decorations_enable = 1; int death = 0, framerender = 0; int amd = 1; int FPSB = 0; @@ -2003,8 +2004,6 @@ int main(int argc, char *argv[]) vy[ny][nx] = -vy[ny][nx]; } } - if ((sdl_mod & (KMOD_RCTRL) )&&( sdl_mod & (KMOD_RALT))) - active_menu = 11; if (sdl_key==SDLK_INSERT)// || sdl_key==SDLK_BACKQUOTE) REPLACE_MODE = !REPLACE_MODE; if (sdl_key==SDLK_BACKQUOTE) @@ -2014,8 +2013,19 @@ int main(int argc, char *argv[]) } if (sdl_key=='b') { - decorations_ui(vid_buf,decorations,&bsx,&bsy);//decoration_mode = !decoration_mode; - sys_pause=1; + if (sdl_mod & KMOD_CTRL) + { + decorations_enable = !decorations_enable; + itc = 51; + if (decorations_enable) strcpy(itc_msg, "Decorations layer: On"); + else strcpy(itc_msg, "Decorations layer: Off"); + } + else + { + decorations_ui(vid_buf,decorations,&bsx,&bsy);//decoration_mode = !decoration_mode; + decorations_enable = 1; + sys_pause=1; + } } if (sdl_key=='g') { @@ -2309,7 +2319,7 @@ int main(int argc, char *argv[]) } } menu_ui_v3(vid_buf, active_menu, &sl, &sr, &dae, b, bq, x, y); //draw the elements in the current menu - draw_decorations(vid_buf,decorations); + if (decorations_enable) draw_decorations(vid_buf,decorations); if (zoom_en && x>=sdl_scale*zoom_wx && y>=sdl_scale*zoom_wy //change mouse position while it is in a zoom window && x<sdl_scale*(zoom_wx+ZFACTOR*ZSIZE) && y<sdl_scale*(zoom_wy+ZFACTOR*ZSIZE)) |