summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-12-11 03:46:34 (GMT)
committer Simon <simon@hardwired.org.uk>2010-12-11 03:46:34 (GMT)
commitbe7acfd99b4a64c1aa86fcff14729caf06d908c4 (patch)
tree219ad095c7d84d3849a807041d8b8d4fde9c3aab
parentd8cd71f912bdea38dff16eeaccf524145c444c1f (diff)
parent2b702ee01f30a46a65415b7cd2816a6aa8b20ee9 (diff)
downloadpowder-be7acfd99b4a64c1aa86fcff14729caf06d908c4.zip
powder-be7acfd99b4a64c1aa86fcff14729caf06d908c4.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
-rw-r--r--includes/powder.h1
-rw-r--r--src/interface.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/includes/powder.h b/includes/powder.h
index 1d3315b..e7af268 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -254,6 +254,7 @@ struct part_state
int burn;
float btemp;
};
+
typedef struct part_state part_state;
//Should probably be const.
/* Weight Help
diff --git a/src/interface.c b/src/interface.c
index 955579a..af679d8 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -2321,7 +2321,7 @@ int search_ui(pixel *vid_buf)
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"))
{
execute_delete(vid_buf, search_ids[dp]);