summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2012-05-28 06:27:46 +0200
committerBardur Arantsson <bardur@scientician.net>2012-05-29 05:38:05 +0200
commitfee1fe9e253d9deb108309658edfa1bd2a1d720c (patch)
treed41b2d80a50b4a3a5a90d4ece3ca3a41b688ceaa
parent48310612100205a13b4d743951fbc436d081d011 (diff)
Lua: Add missing SCHOOL_* variables to spells4.c
-rw-r--r--src/externs.h25
-rw-r--r--src/spells.pkg26
-rw-r--r--src/spells4.c25
3 files changed, 73 insertions, 3 deletions
diff --git a/src/externs.h b/src/externs.h
index 337c503d..f3e5bc02 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -1907,8 +1907,31 @@ char *varda_star_kindler_info();
SGLIB_DEFINE_LIST_PROTOTYPES(spell_idx_list, compare_spell_idx, next);
-extern s32b SCHOOL_UDUN;
+extern s32b SCHOOL_AIR;
+extern s32b SCHOOL_AULE;
+extern s32b SCHOOL_CONVEYANCE;
+extern s32b SCHOOL_DEMON;
+extern s32b SCHOOL_DEVICE;
+extern s32b SCHOOL_DIVINATION;
+extern s32b SCHOOL_EARTH;
+extern s32b SCHOOL_ERU;
+extern s32b SCHOOL_FIRE;
+extern s32b SCHOOL_GEOMANCY;
+extern s32b SCHOOL_MANA;
+extern s32b SCHOOL_MANDOS;
+extern s32b SCHOOL_MANWE;
extern s32b SCHOOL_MELKOR;
+extern s32b SCHOOL_META;
+extern s32b SCHOOL_MIND;
+extern s32b SCHOOL_MUSIC;
+extern s32b SCHOOL_NATURE;
+extern s32b SCHOOL_TEMPORAL;
+extern s32b SCHOOL_TULKAS;
+extern s32b SCHOOL_UDUN;
+extern s32b SCHOOL_ULMO;
+extern s32b SCHOOL_VARDA;
+extern s32b SCHOOL_WATER;
+extern s32b SCHOOL_YAVANNA;
void print_spell_desc(int s, int y);
void init_school_books();
diff --git a/src/spells.pkg b/src/spells.pkg
index 87490e4f..0ea452bf 100644
--- a/src/spells.pkg
+++ b/src/spells.pkg
@@ -2884,7 +2884,31 @@ char *varda_star_kindler_info();
*/
void init_school_books();
-extern s32b SCHOOL_UDUN;
+extern s32b SCHOOL_AIR;
+extern s32b SCHOOL_AULE;
+extern s32b SCHOOL_CONVEYANCE;
+extern s32b SCHOOL_DEMON;
+extern s32b SCHOOL_DEVICE;
+extern s32b SCHOOL_DIVINATION;
+extern s32b SCHOOL_EARTH;
+extern s32b SCHOOL_ERU;
+extern s32b SCHOOL_FIRE;
+extern s32b SCHOOL_GEOMANCY;
+extern s32b SCHOOL_MANA;
+extern s32b SCHOOL_MANDOS;
+extern s32b SCHOOL_MANWE;
extern s32b SCHOOL_MELKOR;
+extern s32b SCHOOL_META;
+extern s32b SCHOOL_MIND;
+extern s32b SCHOOL_MUSIC;
+extern s32b SCHOOL_NATURE;
+extern s32b SCHOOL_TEMPORAL;
+extern s32b SCHOOL_TULKAS;
+extern s32b SCHOOL_UDUN;
+extern s32b SCHOOL_ULMO;
+extern s32b SCHOOL_VARDA;
+extern s32b SCHOOL_WATER;
+extern s32b SCHOOL_YAVANNA;
+
void lua_cast_school_spell @ cast_school_spell(s32b spell_idx, bool no_cost = FALSE);
void spell_description_add_line(s32b spell_idx, cptr line);
diff --git a/src/spells4.c b/src/spells4.c
index 1cbc451c..e270c464 100644
--- a/src/spells4.c
+++ b/src/spells4.c
@@ -4,8 +4,31 @@
school_book_type school_books[SCHOOL_BOOKS_SIZE];
-s32b SCHOOL_UDUN;
+s32b SCHOOL_AIR;
+s32b SCHOOL_AULE;
+s32b SCHOOL_CONVEYANCE;
+s32b SCHOOL_DEMON;
+s32b SCHOOL_DEVICE;
+s32b SCHOOL_DIVINATION;
+s32b SCHOOL_EARTH;
+s32b SCHOOL_ERU;
+s32b SCHOOL_FIRE;
+s32b SCHOOL_GEOMANCY;
+s32b SCHOOL_MANA;
+s32b SCHOOL_MANDOS;
+s32b SCHOOL_MANWE;
s32b SCHOOL_MELKOR;
+s32b SCHOOL_META;
+s32b SCHOOL_MIND;
+s32b SCHOOL_MUSIC;
+s32b SCHOOL_NATURE;
+s32b SCHOOL_TEMPORAL;
+s32b SCHOOL_TULKAS;
+s32b SCHOOL_UDUN;
+s32b SCHOOL_ULMO;
+s32b SCHOOL_VARDA;
+s32b SCHOOL_WATER;
+s32b SCHOOL_YAVANNA;
static int compare_spell_idx(spell_idx_list *a, spell_idx_list *b)
{