matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

Browse Source
This commit is contained in:
Simon Robertshaw 2011-08-19 20:30:53 +01:00
commit aa01aacebe
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/graphics.c
View File

@ -4441,35 +4441,29 @@ pixel *prerender_save(void *save, int size, int *width, int *height)
j=d[p++]; j=d[p++];
if (j<PT_NUM && j>0) if (j<PT_NUM && j>0)
{ {
if (j==PT_STKM) if (j==PT_STKM || j==PT_STKM2)
{ {
//Stickman drawing pixel lc, hc=PIXRGB(255, 224, 178);
for (k=-2; k<=1; k++) if (j==PT_STKM) lc = PIXRGB(255, 255, 255);
else lc = PIXRGB(100, 100, 255);
//only need to check upper bound of y coord - lower bounds and x<w are checked in draw_line
draw_line(fb , x-2, y-2, x+2, y-2, PIXR(lc), PIXG(lc), PIXB(lc), w);
if (y+2<h)
{ {
fb[(y-2)*w+x+k] = PIXRGB(255, 224, 178); draw_line(fb , x-2, y+2, x+2, y+2, PIXR(lc), PIXG(lc), PIXB(lc), w);
fb[(y+2)*w+x+k+1] = PIXRGB(255, 224, 178); draw_line(fb , x-2, y-2, x-2, y+2, PIXR(lc), PIXG(lc), PIXB(lc), w);
fb[(y+k+1)*w+x-2] = PIXRGB(255, 224, 178); draw_line(fb , x+2, y-2, x+2, y+2, PIXR(lc), PIXG(lc), PIXB(lc), w);
fb[(y+k)*w+x+2] = PIXRGB(255, 224, 178);
} }
draw_line(fb , x, y+3, x-1, y+6, 255, 255, 255, w); if (y+6<h)
draw_line(fb , x-1, y+6, x-3, y+12, 255, 255, 255, w);
draw_line(fb , x, y+3, x+1, y+6, 255, 255, 255, w);
draw_line(fb , x+1, y+6, x+3, y+12, 255, 255, 255, w);
}
else if (j==PT_STKM2)
{
//Stickman drawing
for (k=-2; k<=1; k++)
{ {
fb[(y-2)*w+x+k] = PIXRGB(255, 224, 178); draw_line(fb , x, y+3, x-1, y+6, PIXR(hc), PIXG(hc), PIXB(hc), w);
fb[(y+2)*w+x+k+1] = PIXRGB(255, 224, 178); draw_line(fb , x, y+3, x+1, y+6, PIXR(hc), PIXG(hc), PIXB(hc), w);
fb[(y+k+1)*w+x-2] = PIXRGB(255, 224, 178); }
fb[(y+k)*w+x+2] = PIXRGB(255, 224, 178); if (y+12<h)
{
draw_line(fb , x-1, y+6, x-3, y+12, PIXR(hc), PIXG(hc), PIXB(hc), w);
draw_line(fb , x+1, y+6, x+3, y+12, PIXR(hc), PIXG(hc), PIXB(hc), w);
} }
draw_line(fb , x, y+3, x-1, y+6, 255, 255, 255, w);
draw_line(fb , x-1, y+6, x-3, y+12, 255, 255, 255, w);
draw_line(fb , x, y+3, x+1, y+6, 255, 255, 255, w);
draw_line(fb , x+1, y+6, x+3, y+12, 255, 255, 255, w);
} }
else else
fb[y*w+x] = ptypes[j].pcolors; fb[y*w+x] = ptypes[j].pcolors;

4
src/interface.c
View File

@ -5470,7 +5470,7 @@ void catalogue_ui(pixel * vid_buf)
int listy = 0, listxc; int listy = 0, listxc;
int listx = 0, listyc; int listx = 0, listyc;
pixel * vid_buf2; pixel * vid_buf2;
float scrollvel, offsetf = 0.0f; float scrollvel = 0.0f, offsetf = 0.0f;
char savetext[128] = ""; char savetext[128] = "";
char * last = mystrdup(""); char * last = mystrdup("");
savelist_e *saves, *cssave, *csave; savelist_e *saves, *cssave, *csave;
@ -5687,6 +5687,8 @@ openfin:
if(saves) if(saves)
free_saveslist(saves); free_saveslist(saves);
free(last);
free(vid_buf2);
return; return;
} }