summaryrefslogtreecommitdiffstats
path: root/src/scripting/luautil.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/scripting/luautil.cpp')
-rw-r--r--src/scripting/luautil.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/scripting/luautil.cpp b/src/scripting/luautil.cpp
index f21e489..f889aa6 100644
--- a/src/scripting/luautil.cpp
+++ b/src/scripting/luautil.cpp
@@ -223,14 +223,16 @@ int checkSkill(lua_State *s, int p)
return id;
}
-int checkAbility(lua_State *s, int p)
+AbilityManager::AbilityInfo *checkAbility(lua_State *s, int p)
{
+ AbilityManager::AbilityInfo *abilityInfo;
if (lua_isnumber(s, p))
- return luaL_checkint(s, p);
+ abilityInfo = abilityManager->getAbilityInfo(luaL_checkint(s, p));
+ else
+ abilityInfo = abilityManager->getAbilityInfo(luaL_checkstring(s, p));
- int id = abilityManager->getId(luaL_checkstring(s, p));
- luaL_argcheck(s, id != 0, p, "invalid ability name");
- return id;
+ luaL_argcheck(s, abilityInfo != nullptr, p, "invalid ability");
+ return abilityInfo;
}