summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-16 10:44:30 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2007-04-16 10:44:30 +0000
commit69789505c9e30a3a89eb3f82f6a037b03967d21d (patch)
tree41ea67a55418f666d0473d06ec21dd94899d54a8
parent914bc91ff545fe89ffa9442162ebba8ad9ec429c (diff)
downloadcrawl-ref-69789505c9e30a3a89eb3f82f6a037b03967d21d.tar.gz
crawl-ref-69789505c9e30a3a89eb3f82f6a037b03967d21d.zip
Fixes for compiling without Lua. (Darshan, I hope I didn't break anything...)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1319 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/Kills.cc2
-rw-r--r--crawl-ref/source/clua.cc4
-rw-r--r--crawl-ref/source/food.cc2
-rw-r--r--crawl-ref/source/stash.cc2
4 files changed, 10 insertions, 0 deletions
diff --git a/crawl-ref/source/Kills.cc b/crawl-ref/source/Kills.cc
index 3f63c529fc..24d929d02b 100644
--- a/crawl-ref/source/Kills.cc
+++ b/crawl-ref/source/Kills.cc
@@ -1008,6 +1008,7 @@ void lua_open_kills(lua_State *ls)
luaL_openlib(ls, "kills", kill_lib, 0);
}
+#ifdef CLUA_BINDINGS
static void kill_lua_filltable(std::vector<kill_exp> &v)
{
lua_State *ls = clua.state();
@@ -1018,3 +1019,4 @@ static void kill_lua_filltable(std::vector<kill_exp> &v)
lua_rawseti(ls, -2, i + 1);
}
}
+#endif
diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc
index 326a91ff73..06b7c7c87d 100644
--- a/crawl-ref/source/clua.cc
+++ b/crawl-ref/source/clua.cc
@@ -4,6 +4,8 @@
#include "AppHdr.h"
+#ifdef CLUA_BINDINGS
+
#include "clua.h"
#include "abl-show.h"
@@ -2323,3 +2325,5 @@ bool lua_text_pattern::translate() const
return translated;
}
+
+#endif
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index ba6c1539d2..185b83185e 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -348,6 +348,7 @@ bool butchery(void)
return false;
} // end butchery()
+#ifdef CLUA_BINDINGS
void lua_push_items(lua_State *ls, int link)
{
lua_newtable(ls);
@@ -379,6 +380,7 @@ void lua_push_inv_items(lua_State *ls = NULL)
}
}
}
+#endif
static bool userdef_eat_food()
{
diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index dcac179e8b..8f08374c36 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -1327,10 +1327,12 @@ 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())
{