From 4b57962ee4c10e48956c2888199605bebdb17b8f Mon Sep 17 00:00:00 2001 From: Erik Schilling Date: Wed, 3 Apr 2013 14:32:57 +0200 Subject: Moved the Monster class to a Component Things done: - Allowed to create new Attributes outside of the protected scope of Being - Moved Monster to MonsterComponent - Some minor cleanup in the Attribute setting code of monsters --- src/scripting/luautil.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/scripting/luautil.cpp') diff --git a/src/scripting/luautil.cpp b/src/scripting/luautil.cpp index 24e9edf..d082cbe 100644 --- a/src/scripting/luautil.cpp +++ b/src/scripting/luautil.cpp @@ -158,14 +158,14 @@ ItemClass *getItemClass(lua_State *s, int p) return itemClass; } -Monster *getMonster(lua_State *s, int p) +Being *getMonster(lua_State *s, int p) { if (!lua_islightuserdata(s, p)) return 0; Entity *t = static_cast(lua_touserdata(s, p)); if (t->getType() != OBJECT_MONSTER) return 0; - return static_cast(t); + return static_cast(t); } MonsterClass *getMonsterClass(lua_State *s, int p) @@ -220,9 +220,9 @@ ItemClass *checkItemClass(lua_State *s, int p) return itemClass; } -Monster *checkMonster(lua_State *s, int p) +Being *checkMonster(lua_State *s, int p) { - Monster *monster = getMonster(s, p); + Being *monster = getMonster(s, p); luaL_argcheck(s, monster, p, "monster expected"); return monster; } -- cgit