summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-25 18:39:07 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-25 18:39:07 +0000
commit2184f5a98edb10e49ec9b7611601552fe686d737 (patch)
treef969f1cf2bf425cd29b0d3ecda55a734d15d72ea
parentf9496f504d2f1e1dc21de9cb67b155bbce98a1a7 (diff)
downloadcrawl-ref-2184f5a98edb10e49ec9b7611601552fe686d737.tar.gz
crawl-ref-2184f5a98edb10e49ec9b7611601552fe686d737.zip
Fix compile warnings (Napkin).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7620 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/clua.cc4
-rw-r--r--crawl-ref/source/clua.h1
-rw-r--r--crawl-ref/source/luadgn.cc2
3 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc
index 5d4cdb5e36..09ab691cec 100644
--- a/crawl-ref/source/clua.cc
+++ b/crawl-ref/source/clua.cc
@@ -3023,6 +3023,10 @@ std::string quote_lua_string(const std::string &s)
/////////////////////////////////////////////////////////////////////
+lua_shutdown_listener::~lua_shutdown_listener()
+{
+}
+
lua_datum::lua_datum(CLua &_lua, int stackpos, bool pop)
: need_cleanup(true), lua(_lua)
{
diff --git a/crawl-ref/source/clua.h b/crawl-ref/source/clua.h
index 136e332b19..2d255189b2 100644
--- a/crawl-ref/source/clua.h
+++ b/crawl-ref/source/clua.h
@@ -60,6 +60,7 @@ private:
class lua_shutdown_listener
{
public:
+ virtual ~lua_shutdown_listener();
virtual void shutdown(CLua &lua) = 0;
};
diff --git a/crawl-ref/source/luadgn.cc b/crawl-ref/source/luadgn.cc
index c4da5054c1..1a688561a3 100644
--- a/crawl-ref/source/luadgn.cc
+++ b/crawl-ref/source/luadgn.cc
@@ -1119,7 +1119,7 @@ static int _lua_colour(lua_State *ls, int ndx,
int forbidden_colour = -1)
{
if (lua_isnumber(ls, ndx))
- return lua_tonumber(ls, ndx);
+ return lua_tointeger(ls, ndx);
else if (const char *s = luaL_checkstring(ls, ndx))
{
const int colour = str_to_colour(s);