diff options
author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-21 12:15:06 +0200 |
---|---|---|
committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-21 12:15:06 +0200 |
commit | 5b65cad7433ded2e76bd162c21709133f7cfc439 (patch) | |
tree | b4cebdc6bab1596381ede422d14b998ed2405588 /crawl-ref/source | |
parent | caae98284820a7ce9cf47868ba621f613e611e1e (diff) | |
download | crawl-ref-5b65cad7433ded2e76bd162c21709133f7cfc439.tar.gz crawl-ref-5b65cad7433ded2e76bd162c21709133f7cfc439.zip |
Create l_defs.h and move stuff there.
l_defs.h contains headers for things defined in the Lua functions
but used elsewhere. This should probably not exist long-term.
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/abyss.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/arena.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/debug.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/directn.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/dlua.h | 7 | ||||
-rw-r--r-- | crawl-ref/source/dungeon.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/l_defs.h | 18 | ||||
-rw-r--r-- | crawl-ref/source/l_dgn.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/mapdef.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/mapmark.cc | 1 |
10 files changed, 27 insertions, 6 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index 7adb8bed93..4c2f8b9458 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -25,6 +25,7 @@ #include "player.h" #include "dungeon.h" #include "items.h" +#include "l_defs.h" #include "lev-pand.h" #include "los.h" #include "religion.h" diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc index a29292cd21..44bdc34b59 100644 --- a/crawl-ref/source/arena.cc +++ b/crawl-ref/source/arena.cc @@ -14,6 +14,7 @@ #include "initfile.h" #include "items.h" #include "itemname.h" // for make_name() +#include "l_defs.h" #include "libutil.h" #include "macro.h" #include "maps.h" diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index 52c28e0dbc..e4877d06c8 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -47,6 +47,7 @@ #include "itemprop.h" #include "item_use.h" #include "items.h" +#include "l_defs.h" #include "makeitem.h" #include "mapdef.h" #include "mapmark.h" diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index f70a70cbba..e4181e26e6 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -32,6 +32,7 @@ #include "invent.h" #include "itemname.h" #include "items.h" +#include "l_defs.h" #include "los.h" #include "mapmark.h" #include "message.h" diff --git a/crawl-ref/source/dlua.h b/crawl-ref/source/dlua.h index 8d5feaa119..8df5841da2 100644 --- a/crawl-ref/source/dlua.h +++ b/crawl-ref/source/dlua.h @@ -71,13 +71,8 @@ public: }; void init_dungeon_lua(); -std::string dgn_set_default_depth(const std::string &s); -void dgn_reset_default_depth(); -int dlua_stringtable(lua_State *ls, const std::vector<std::string> &s); -dungeon_feature_type dungeon_feature_by_name(const std::string &name); -std::vector<std::string> dungeon_feature_matches(const std::string &name); -const char *dungeon_feature_name(dungeon_feature_type feat); +int dlua_stringtable(lua_State *ls, const std::vector<std::string> &s); void print_dlua_stack(); diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 141073a9de..89898077ed 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -29,6 +29,7 @@ #include "itemname.h" #include "itemprop.h" #include "items.h" +#include "l_defs.h" #include "los.h" #include "makeitem.h" #include "mapdef.h" diff --git a/crawl-ref/source/l_defs.h b/crawl-ref/source/l_defs.h new file mode 100644 index 0000000000..439e9e7d0e --- /dev/null +++ b/crawl-ref/source/l_defs.h @@ -0,0 +1,18 @@ +/* + * File: l_defs.h + * Summary: Functions defined in the Lua bindings but used elsewhere. + * + * TODO: Move these where they belong. + */ + +#ifndef L_DEFS_H +#define L_DEFS_H + +dungeon_feature_type dungeon_feature_by_name(const std::string &name); +std::vector<std::string> dungeon_feature_matches(const std::string &name); +const char *dungeon_feature_name(dungeon_feature_type feat); +std::string dgn_set_default_depth(const std::string &s); +void dgn_reset_default_depth(); + +#endif + diff --git a/crawl-ref/source/l_dgn.cc b/crawl-ref/source/l_dgn.cc index 3fcf3ac5a6..bc1e1d422b 100644 --- a/crawl-ref/source/l_dgn.cc +++ b/crawl-ref/source/l_dgn.cc @@ -7,6 +7,7 @@ #include "branch.h" #include "cloud.h" +#include "l_defs.h" #include "initfile.h" #include "mapmark.h" #include "maps.h" diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index 96de66400a..dc3db2c3e4 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -22,6 +22,7 @@ #include "initfile.h" #include "invent.h" #include "items.h" +#include "l_defs.h" #include "libutil.h" #include "mapdef.h" #include "mapmark.h" diff --git a/crawl-ref/source/mapmark.cc b/crawl-ref/source/mapmark.cc index 2003f87325..2a12913e28 100644 --- a/crawl-ref/source/mapmark.cc +++ b/crawl-ref/source/mapmark.cc @@ -15,6 +15,7 @@ #include "directn.h" #include "dlua.h" #include "libutil.h" +#include "l_defs.h" #include "l_libs.h" #include "stuff.h" #include "tags.h" |