From 2184f5a98edb10e49ec9b7611601552fe686d737 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Tue, 25 Nov 2008 18:39:07 +0000
Subject: Fix compile warnings (Napkin).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7620 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/clua.cc   | 4 ++++
 crawl-ref/source/clua.h    | 1 +
 crawl-ref/source/luadgn.cc | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

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);
-- 
cgit v1.2.3-54-g00ecf