Lua: Rework get_level_school() callout

2 files changed, 16 insertions, 1 deletions

diff --git a/src/externs.h b/src/externs.h
index 0b7b2575..564c0b2b 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -2307,6 +2307,7 @@ extern s32b get_level_device(s32b s, s32b max, s32b min);
 extern int get_mana(s32b s);
 extern s32b spell_chance(s32b s);
 extern s32b get_level(s32b s, s32b max, s32b min);
+extern void get_level_school(s32b s, s32b max, s32b min, s32b *level, bool_ *na);
 extern s32b lua_spell_chance(s32b chance, int level, int skill_level, int mana, int cur_mana, int stat);
 extern s32b lua_spell_device_chance(s32b chance, int level, int base_level);
 
diff --git a/src/lua_bind.c b/src/lua_bind.c
index 409e005d..a019004b 100644
--- a/src/lua_bind.c
+++ b/src/lua_bind.c
@@ -271,13 +271,27 @@ s32b spell_chance(s32b s)
 	}
 }
 
+void get_level_school(s32b s, s32b max, s32b min, s32b *level, bool_ *na)
+{
+	if (level != NULL)
+	{
+		*level = exec_lua(format("local lvl, na = get_level_school(%d, %d, %d); return lvl", s, max, min));
+	}
+
+	if (na != NULL)
+	{
+		*na =  exec_lua(format("local lvl, na = get_level_school(%d, %d, %d); return (na == \"n/a\")", s, max, min));
+	}
+}
+
 s32b get_level(s32b s, s32b max, s32b min)
 {
 	/** Ahah shall we use Magic device instead ? */
 	if (get_level_use_stick > -1) {
 		return get_level_device(s, max, min);
 	} else {
-		int level = exec_lua(format("local lvl, na = get_level_school(%d, %d, %d); return lvl", s, max, min));
+		s32b level;
+		get_level_school(s, max, min, &level, NULL);
 		return level;
 	}
 }