summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsavask <savask@yandex.ru>2011-10-15 15:39:35 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-10-26 14:34:54 (GMT)
commita075fd5a9a8e0fd78c7a80b51d95e2190bddda91 (patch)
tree4530f7b3aa8e24d68d7766e9744197d5d1425532 /src
parent573bda09500297caf9ad48889f7b191f42d31526 (diff)
downloadpowder-a075fd5a9a8e0fd78c7a80b51d95e2190bddda91.zip
powder-a075fd5a9a8e0fd78c7a80b51d95e2190bddda91.tar.gz
Fix one merging error, and adjusted fighters' array.
Diffstat (limited to 'src')
-rw-r--r--src/powder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c
index e5680eb..41f9196 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -2890,7 +2890,7 @@ int create_parts(int x, int y, int rx, int ry, int c, int flags)
int wall = c - 100;
if (c==SPC_WIND || c==PT_FIGH)
return 0;
- }
+
if(c==SPC_PROP){
prop_edit_ui(vid_buf, x, y);
return 0;