summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2006-11-06 12:29:21 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2006-11-06 12:29:21 +0000
commit4a0f2d58c34e432bc47aca79ee5d29f19c4438ea (patch)
treeaae0a0bdb07b28d3600fc26631bf0c4ef499c0be
parent73d83cbbd3b92df1a6655a31f6d84f84e558257e (diff)
downloadcrawl-ref-4a0f2d58c34e432bc47aca79ee5d29f19c4438ea.tar.gz
crawl-ref-4a0f2d58c34e432bc47aca79ee5d29f19c4438ea.zip
Fix for 1591269, dissection failure hints why without easy_butcher.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@341 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/food.cc6
-rw-r--r--crawl-ref/source/makefile.lnx4
2 files changed, 8 insertions, 2 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index e24924c160..1f58c8a56b 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -216,6 +216,12 @@ bool butchery(void)
return (false);
}
+ if (!Options.easy_butcher && !can_butcher)
+ {
+ mpr("Maybe you should try using a sharper implement.");
+ return (false);
+ }
+
if (player_is_levitating() && !wearing_amulet(AMU_CONTROLLED_FLIGHT))
{
mpr("You can't reach the floor from up here.");
diff --git a/crawl-ref/source/makefile.lnx b/crawl-ref/source/makefile.lnx
index f6c90f7172..b8d277f5ec 100644
--- a/crawl-ref/source/makefile.lnx
+++ b/crawl-ref/source/makefile.lnx
@@ -32,12 +32,12 @@ LIB = -lncurses
INCLUDES = -I/usr/include/ncurses
# If you have lex and yacc, set DOYACC to y (lowercase y).
-DOYACC := n
+DOYACC := y
UTIL = util/
LEX := lex
-YACC := yacc
+YACC := bison -y
YTABC := y.tab.c
YTABH := y.tab.h