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

This commit is contained in:
Simon
2010-12-11 03:46:34 +00:00
2 changed files with 2 additions and 1 deletions

View File

@@ -254,6 +254,7 @@ struct part_state
int burn; int burn;
float btemp; float btemp;
}; };
typedef struct part_state part_state; typedef struct part_state part_state;
//Should probably be const. //Should probably be const.
/* Weight Help /* Weight Help

View File

@@ -2321,7 +2321,7 @@ int search_ui(pixel *vid_buf)
lasttime = TIMEOUT; lasttime = TIMEOUT;
} }
if(b && !bq && dp!=-1 && search_fav==0) if(b && !bq && dp!=-1 && search_fav!=0)
if(confirm_ui(vid_buf, "Do you want to delete?", search_names[dp], "Delete")) if(confirm_ui(vid_buf, "Do you want to delete?", search_names[dp], "Delete"))
{ {
execute_delete(vid_buf, search_ids[dp]); execute_delete(vid_buf, search_ids[dp]);