From 10fe47ad83a36b4371c1dd8df85544a8189080d7 Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Fri, 19 Aug 2011 03:00:02 +0800
Subject: Created function to make getting monsters easier in scripts.

---
 src/scripting/lua.cpp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'src/scripting/lua.cpp')

diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp
index cfc07f10..7cc09d56 100644
--- a/src/scripting/lua.cpp
+++ b/src/scripting/lua.cpp
@@ -1130,12 +1130,7 @@ static int monster_get_name(lua_State *s)
 static int monster_change_anger(lua_State *s)
 {
     const int anger = luaL_checkint(s, 3);
-    if (!lua_islightuserdata(s, 1))
-    {
-        lua_pushboolean(s, false);
-        return 1;
-    }
-    Monster *m = dynamic_cast<Monster *>((Thing *)lua_touserdata(s, 1));
+    Monster *m = getMonster(s, 1);
     if (!m)
     {
         raiseScriptError(s, "monster_change_anger called "
@@ -1159,14 +1154,8 @@ static int monster_change_anger(lua_State *s)
  */
 static int monster_remove(lua_State *s)
 {
-    if (!lua_islightuserdata(s, 1))
-    {
-        lua_pushboolean(s, false);
-        return 1;
-    }
-
     bool monsterEnqueued = false;
-    Monster *m = dynamic_cast<Monster *>((Thing *)lua_touserdata(s, 1));
+    Monster *m = getMonster(s, 1);
     if (m)
     {
         GameState::enqueueRemove(m);
@@ -1182,7 +1171,7 @@ static int monster_remove(lua_State *s)
  */
 static int monster_load_script(lua_State *s)
 {
-    Monster *m = static_cast< Monster* >(getBeing(s, 1));
+    Monster *m = getMonster(s, 1);
     if (!m)
     {
          raiseScriptError(s, "monster_load_script called "
-- 
cgit v1.2.3-70-g09d2