summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-04-24 03:17:35 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-04-24 19:04:05 (GMT)
commit0ccd04b848aad6d6b454d869dcda5c92b0653997 (patch)
tree482e0e89c89a3e61c06280a67669e815686241ec /src/main.c
parent88995a591020f02c495547b00abde98b0df14051 (diff)
downloadpowder-0ccd04b848aad6d6b454d869dcda5c92b0653997.zip
powder-0ccd04b848aad6d6b454d869dcda5c92b0653997.tar.gz
More decoration improvements. still TODO: text boxes that will change current color, as well as display current color. A menu with some basic color swatches.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c
index c435d3b..e0aee47 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3281,7 +3281,10 @@ int main(int argc, char *argv[])
//hud_enable = !console_mode;
}
if (sdl_key=='b')
+ {
decorations_ui(vid_buf,decorations,&bsx,&bsy);//decoration_mode = !decoration_mode;
+ sys_pause=1;
+ }
if (sdl_key=='g')
{
if (sdl_mod & (KMOD_SHIFT))
@@ -3924,11 +3927,7 @@ int main(int argc, char *argv[])
ISSPAWN1 = 0;
ISSPAWN2 = 0;
- memset(fire_bg, 0, XRES*YRES*PIXELSIZE);
- memset(pers_bg, 0, (XRES+BARSIZE)*YRES*PIXELSIZE);
- memset(fire_r, 0, sizeof(fire_r));
- memset(fire_g, 0, sizeof(fire_g));
- memset(fire_b, 0, sizeof(fire_b));
+ memset(decorations, 0, (XRES+BARSIZE)*YRES*PIXELSIZE);
}
if (x>=(XRES+BARSIZE-(510-385)) && x<=(XRES+BARSIZE-(510-476)))
{