mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-09-02 04:22:34 +02:00
Code Issues Projects Releases Wiki Activity

ability to delete corrupted stamps

Browse Source
This commit is contained in:
Jacob1
2012-01-20 06:29:35 +08:00
committed by Simon Robertshaw
parent 8a11b6b31d
commit 509f1d2139
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/interface.c
View File

@@ -1615,7 +1615,7 @@ int stamp_ui(pixel *vid_buf)
for (j=0; j<GRID_Y; j++) for (j=0; j<GRID_Y; j++)
for (i=0; i<GRID_X; i++) for (i=0; i<GRID_X; i++)
{ {
if (stamps[k].name[0] && stamps[k].thumb) if (stamps[k].name[0])
{ {
gx = ((XRES/GRID_X)*i) + (XRES/GRID_X-XRES/GRID_S)/2; gx = ((XRES/GRID_X)*i) + (XRES/GRID_X-XRES/GRID_S)/2;
gy = ((((YRES-MENUSIZE+20)+15)/GRID_Y)*j) + ((YRES-MENUSIZE+20)/GRID_Y-(YRES-MENUSIZE+20)/GRID_S+10)/2 + 18; gy = ((((YRES-MENUSIZE+20)+15)/GRID_Y)*j) + ((YRES-MENUSIZE+20)/GRID_Y-(YRES-MENUSIZE+20)/GRID_S+10)/2 + 18;
@@ -1626,8 +1626,15 @@ int stamp_ui(pixel *vid_buf)
h = stamps[k].thumb_h; h = stamps[k].thumb_h;
x -= w/2; x -= w/2;
y -= h/2; y -= h/2;
draw_image(vid_buf, stamps[k].thumb, gx+(((XRES/GRID_S)/2)-(w/2)), gy+(((YRES/GRID_S)/2)-(h/2)), w, h, 255); if (stamps[k].thumb)
xor_rect(vid_buf, gx+(((XRES/GRID_S)/2)-(w/2)), gy+(((YRES/GRID_S)/2)-(h/2)), w, h); {
draw_image(vid_buf, stamps[k].thumb, gx+(((XRES/GRID_S)/2)-(w/2)), gy+(((YRES/GRID_S)/2)-(h/2)), w, h, 255);
xor_rect(vid_buf, gx+(((XRES/GRID_S)/2)-(w/2)), gy+(((YRES/GRID_S)/2)-(h/2)), w, h);
}
else
{
drawtext(vid_buf, gx+8, gy+((YRES/GRID_S)/2)-4, "Error loading stamp", 255, 255, 255, 255);
}
if (mx>=gx+XRES/GRID_S-4 && mx<(gx+XRES/GRID_S)+6 && my>=gy-6 && my<gy+4) if (mx>=gx+XRES/GRID_S-4 && mx<(gx+XRES/GRID_S)+6 && my>=gy-6 && my<gy+4)
{ {
d = k; d = k;
@@ -1636,7 +1643,7 @@ int stamp_ui(pixel *vid_buf)
} }
else else
{ {
if (mx>=gx && mx<gx+(XRES/GRID_S) && my>=gy && my<gy+(YRES/GRID_S)) if (mx>=gx && mx<gx+(XRES/GRID_S) && my>=gy && my<gy+(YRES/GRID_S) && stamps[k].thumb)
{ {
r = k; r = k;
drawrect(vid_buf, gx-2, gy-2, XRES/GRID_S+3, YRES/GRID_S+3, 128, 128, 210, 255); drawrect(vid_buf, gx-2, gy-2, XRES/GRID_S+3, YRES/GRID_S+3, 128, 128, 210, 255);