summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-16 12:02:06 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-16 12:02:06 +0000
commit7ebfea944a75a5c799d87d038ad9f6e67e79bed5 (patch)
treec237f11310e9b8206fde722dc38b32f729076b4b /crawl-ref
parent69789505c9e30a3a89eb3f82f6a037b03967d21d (diff)
downloadcrawl-ref-7ebfea944a75a5c799d87d038ad9f6e67e79bed5.tar.gz
crawl-ref-7ebfea944a75a5c799d87d038ad9f6e67e79bed5.zip
Tweaked to allow building without CLUA_BINDINGS, but allowing
Lua-conditionalised search patterns. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1320 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/clua.cc4
-rw-r--r--crawl-ref/source/food.cc2
-rw-r--r--crawl-ref/source/macro.cc2
-rw-r--r--crawl-ref/source/stash.cc2
4 files changed, 0 insertions, 10 deletions
diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc
index 06b7c7c87d..326a91ff73 100644
--- a/crawl-ref/source/clua.cc
+++ b/crawl-ref/source/clua.cc
@@ -4,8 +4,6 @@
#include "AppHdr.h"
-#ifdef CLUA_BINDINGS
-
#include "clua.h"
#include "abl-show.h"
@@ -2325,5 +2323,3 @@ bool lua_text_pattern::translate() const
return translated;
}
-
-#endif
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 185b83185e..ba6c1539d2 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -348,7 +348,6 @@ bool butchery(void)
return false;
} // end butchery()
-#ifdef CLUA_BINDINGS
void lua_push_items(lua_State *ls, int link)
{
lua_newtable(ls);
@@ -380,7 +379,6 @@ void lua_push_inv_items(lua_State *ls = NULL)
}
}
}
-#endif
static bool userdef_eat_food()
{
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index 2420971a40..17b7fa0c49 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -737,7 +737,6 @@ int macro_init( void )
return (0);
}
-#ifdef CLUA_BINDINGS
void macro_userfn(const char *keys, const char *regname)
{
// TODO: Implement.
@@ -745,4 +744,3 @@ void macro_userfn(const char *keys, const char *regname)
// requires a mapping of key names to whatever getch() spits back, unlikely
// to happen in a hurry.
}
-#endif
diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index 8f08374c36..dcac179e8b 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -1327,12 +1327,10 @@ void StashTracker::search_stashes()
text_pattern tpat( csearch, true );
search = &tpat;
-#ifdef CLUA_BINDINGS
lua_text_pattern ltpat( csearch );
if (lua_text_pattern::is_lua_pattern(csearch))
search = &ltpat;
-#endif
if (!search->valid())
{