summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2011-05-28 20:24:07 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-05-29 12:34:50 (GMT)
commita2c171fbf91e024767ecb8a800a3d7ec13e5d611 (patch)
treea4d5b0644e3c0c6bd5a72249024883cf7ddc17c9 /src/main.c
parent6a2f357efd2dac87a4a9f30206717500440d2a76 (diff)
downloadpowder-a2c171fbf91e024767ecb8a800a3d7ec13e5d611.zip
powder-a2c171fbf91e024767ecb8a800a3d7ec13e5d611.tar.gz
Remove remaining references to old decorations buffer
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c
index 446f167..e53c6ae 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1437,8 +1437,7 @@ int main(int argc, char *argv[])
parts[i].life = i+1;
parts[NPART-1].life = -1;
pfree = 0;
-
- decorations = calloc((XRES+BARSIZE)*YRES, PIXELSIZE);
+
pers_bg = calloc((XRES+BARSIZE)*YRES, PIXELSIZE);
fire_bg = calloc(XRES*YRES, PIXELSIZE);
@@ -2173,7 +2172,7 @@ int main(int argc, char *argv[])
}
else
{
- hsvSave = decorations_ui(vid_buf,decorations,&bsx,&bsy,hsvSave);//decoration_mode = !decoration_mode;
+ hsvSave = decorations_ui(vid_buf,&bsx,&bsy,hsvSave);//decoration_mode = !decoration_mode;
decorations_enable = 1;
sys_pause=1;
}
@@ -2470,7 +2469,6 @@ 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
- 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))
@@ -2825,8 +2823,6 @@ int main(int argc, char *argv[])
isplayer = 0;
ISSPAWN1 = 0;
ISSPAWN2 = 0;
-
- memset(decorations, 0, (XRES+BARSIZE)*YRES*PIXELSIZE);
}
if (x>=(XRES+BARSIZE-(510-385)) && x<=(XRES+BARSIZE-(510-476)))
{