From 7c97899cefb5ed1dd3547b9800f96b5a4cb24bf6 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Tue, 20 Oct 2009 16:06:40 +0200 Subject: Move clua crawl_lib from clua to l_crawl.cc. To avoid name clashes, rename dlua libs from *_lib to *_dlib. --- crawl-ref/source/dlua.cc | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'crawl-ref/source/dlua.cc') diff --git a/crawl-ref/source/dlua.cc b/crawl-ref/source/dlua.cc index 4461a99748..27898f1b81 100644 --- a/crawl-ref/source/dlua.cc +++ b/crawl-ref/source/dlua.cc @@ -306,20 +306,21 @@ void init_dungeon_lua() { lua_stack_cleaner clean(dlua); - luaL_openlib(dlua, "dgn", dgn_lib, 0); - luaL_openlib(dlua, "dgn", dgn_build_lib, 0); - luaL_openlib(dlua, "dgn", dgn_event_lib, 0); - luaL_openlib(dlua, "dgn", dgn_grid_lib, 0); - luaL_openlib(dlua, "dgn", dgn_item_lib, 0); - luaL_openlib(dlua, "dgn", dgn_level_lib, 0); - luaL_openlib(dlua, "dgn", dgn_mons_lib, 0); - luaL_openlib(dlua, "dgn", dgn_tile_lib, 0); - - luaL_openlib(dlua, "crawl", crawl_lib, 0); - luaL_openlib(dlua, "debug", debug_lib, 0); - luaL_openlib(dlua, "file", file_lib, 0); - luaL_openlib(dlua, "you", you_lib, 0); - luaL_openlib(dlua, "los", los_lib, 0); + dluaopen_crawl(dlua); + + luaL_openlib(dlua, "dgn", dgn_dlib, 0); + luaL_openlib(dlua, "dgn", dgn_build_dlib, 0); + luaL_openlib(dlua, "dgn", dgn_event_dlib, 0); + luaL_openlib(dlua, "dgn", dgn_grid_dlib, 0); + luaL_openlib(dlua, "dgn", dgn_item_dlib, 0); + luaL_openlib(dlua, "dgn", dgn_level_dlib, 0); + luaL_openlib(dlua, "dgn", dgn_mons_dlib, 0); + luaL_openlib(dlua, "dgn", dgn_tile_dlib, 0); + + luaL_openlib(dlua, "debug", debug_dlib, 0); + luaL_openlib(dlua, "file", file_dlib, 0); + luaL_openlib(dlua, "you", you_dlib, 0); + luaL_openlib(dlua, "los", los_dlib, 0); dlua.execfile("clua/dungeon.lua", true, true); dlua.execfile("clua/luamark.lua", true, true); -- cgit v1.2.3-54-g00ecf