diff options
author | Bardur Arantsson <bardur@scientician.net> | 2012-03-29 21:10:37 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2012-03-29 21:16:06 +0200 |
commit | b09c86b9828d931638b48864a65658a20d2ad864 (patch) | |
tree | 1cdf0aabdfa23f8761e3499f1dcdb4ff988ad133 | |
parent | db5ec646ef4c0d802221ea10a543c38ce59b5d16 (diff) |
Remove unused Lua functions for level generation.
-rw-r--r-- | lib/core/dungeon.lua | 35 | ||||
-rw-r--r-- | lib/mods/theme/core/dungeon.lua | 35 | ||||
-rw-r--r-- | src/dungeon.pkg | 11 | ||||
-rw-r--r-- | src/externs.h | 1 | ||||
-rw-r--r-- | src/lua_bind.c | 17 |
5 files changed, 0 insertions, 99 deletions
diff --git a/lib/core/dungeon.lua b/lib/core/dungeon.lua index 2877838d..fc8364bd 100644 --- a/lib/core/dungeon.lua +++ b/lib/core/dungeon.lua @@ -69,38 +69,3 @@ function place_trap(y, x, level) %place_trap(y, x) dun_level = old_dun end - --- Level generators processing -__level_generators = {} - -function level_generator(t) - assert(t.name, "no generator name") - assert(t.gen, "no generator function") - - if not t.stairs then t.stairs = TRUE end - if not t.monsters then t.monsters = TRUE end - if not t.objects then t.objects = TRUE end - if not t.miscs then t.miscs = TRUE end - - __level_generators[t.name] = t.gen - add_scripted_generator(t.name, t.stairs, t.monsters, t.objects, t.miscs) -end - -function level_generate(name) - assert(__level_generators[name], "Unknown level generator '"..name.."'") - return __level_generators[name]() -end - ---[[ Example -level_generator -{ - ["name"] = "test", - ["gen"] = function() - print("zog") - for i = 1, 30 do - cave(i, 2).feat = 1 - end - return new_player_spot(get_branch()) - end, -} -]] diff --git a/lib/mods/theme/core/dungeon.lua b/lib/mods/theme/core/dungeon.lua index 2877838d..fc8364bd 100644 --- a/lib/mods/theme/core/dungeon.lua +++ b/lib/mods/theme/core/dungeon.lua @@ -69,38 +69,3 @@ function place_trap(y, x, level) %place_trap(y, x) dun_level = old_dun end - --- Level generators processing -__level_generators = {} - -function level_generator(t) - assert(t.name, "no generator name") - assert(t.gen, "no generator function") - - if not t.stairs then t.stairs = TRUE end - if not t.monsters then t.monsters = TRUE end - if not t.objects then t.objects = TRUE end - if not t.miscs then t.miscs = TRUE end - - __level_generators[t.name] = t.gen - add_scripted_generator(t.name, t.stairs, t.monsters, t.objects, t.miscs) -end - -function level_generate(name) - assert(__level_generators[name], "Unknown level generator '"..name.."'") - return __level_generators[name]() -end - ---[[ Example -level_generator -{ - ["name"] = "test", - ["gen"] = function() - print("zog") - for i = 1, 30 do - cave(i, 2).feat = 1 - end - return new_player_spot(get_branch()) - end, -} -]] diff --git a/src/dungeon.pkg b/src/dungeon.pkg index 3e11338d..f5e4045f 100644 --- a/src/dungeon.pkg +++ b/src/dungeon.pkg @@ -1496,17 +1496,6 @@ extern void place_floor(int y, int x); */ extern void place_filler(int y, int x); -/** @fn add_scripted_generator(cptr name, bool stairs, bool monsters, bool objects, bool miscs) - * @dgonly - * @param name String \n Name of generator - * @param stairs Boolean \n TRUE if stairs can be generated, otherwise FALSE - * @param monsters Boolean \n TRUE if monsters can be generated, otherwise FALSE - * @param objects Boolean \n TRUE if objects can be generated, otherwise FALSE - * @param miscs Boolean \n TRUE if other stuff can be generated, otherwise FALSE - * @note (defined in file lua_bind.c) - */ -extern void add_scripted_generator(cptr name, bool stairs, bool monsters, bool objects, bool miscs); - /** @fn new_player_spot(int branch) * @brief Places player in a new location.\n * @param branch Number \n branch is the dungeon branch (if any). diff --git a/src/externs.h b/src/externs.h index 5ccc13a9..f5bb610c 100644 --- a/src/externs.h +++ b/src/externs.h @@ -1824,7 +1824,6 @@ extern void lua_delete_list(list_type *, int size); extern void lua_add_to_list(list_type *, int idx, cptr str); extern void lua_display_list(int y, int x, int h, int w, cptr title, list_type *list, int max, int begin, int sel, byte sel_color); -extern void add_scripted_generator(cptr name, bool_ stairs, bool_ monsters, bool_ objects, bool_ miscs); /* skills.c */ extern void dump_skills(FILE *fff); diff --git a/src/lua_bind.c b/src/lua_bind.c index 693c7e72..116147e9 100644 --- a/src/lua_bind.c +++ b/src/lua_bind.c @@ -527,23 +527,6 @@ void lua_display_list(int y, int x, int h, int w, cptr title, list_type* list, i } /* - * Level generators - */ -bool_ level_generate_script(cptr name) -{ - s32b ret = FALSE; - - call_lua("level_generate", "(s)", "d", name, &ret); - - return ret; -} - -void add_scripted_generator(cptr name, bool_ stairs, bool_ monsters, bool_ objects, bool_ miscs) -{ - add_level_generator(name, level_generate_script, stairs, monsters, objects, miscs); -} - -/* * Gods */ s16b add_new_gods(char *name) |