From 1d595f47d0064f85ce2b6c37eaae74205146b3a5 Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rvollmert@gmx.net>
Date: Tue, 20 Oct 2009 22:22:22 +0200
Subject: Comments and renaming for consistency.

---
 crawl-ref/source/clua.cc  | 6 +-----
 crawl-ref/source/kills.cc | 2 +-
 crawl-ref/source/l_libs.h | 6 ++++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc
index 02f4a6c69e..d7e525da6c 100644
--- a/crawl-ref/source/clua.cc
+++ b/crawl-ref/source/clua.cc
@@ -587,10 +587,6 @@ bool CLua::callfn(const char *fn, int nargs, int nret)
     return !err;
 }
 
-// Defined in kills.cc because the kill bindings refer to kills.cc local
-// structs
-extern void luaopen_kills(lua_State *ls);
-
 void CLua::init_lua()
 {
     if (_state)
@@ -610,7 +606,7 @@ void CLua::init_lua()
     luaopen_math(_state);
 
     // Open Crawl bindings
-    luaopen_kills(_state);
+    cluaopen_kills(_state);
     cluaopen_you(_state);
     cluaopen_item(_state);
     cluaopen_food(_state);
diff --git a/crawl-ref/source/kills.cc b/crawl-ref/source/kills.cc
index ffc8b99473..6b404064ba 100644
--- a/crawl-ref/source/kills.cc
+++ b/crawl-ref/source/kills.cc
@@ -989,7 +989,7 @@ static const struct luaL_reg kill_lib[] =
     { NULL, NULL }
 };
 
-void luaopen_kills(lua_State *ls)
+void cluaopen_kills(lua_State *ls)
 {
     luaL_openlib(ls, "kills", kill_lib, 0);
 }
diff --git a/crawl-ref/source/l_libs.h b/crawl-ref/source/l_libs.h
index 05c71dca4d..ccf02d5369 100644
--- a/crawl-ref/source/l_libs.h
+++ b/crawl-ref/source/l_libs.h
@@ -9,13 +9,14 @@
 #include "clua.h"
 
 /*
- * Loaders for clua.
+ * Library loaders for clua.
  */
 
 void cluaopen_crawl(lua_State *ls);
 void cluaopen_file(lua_State *ls);
 void cluaopen_food(lua_State *ls);
 void cluaopen_item(lua_State *ls);
+void cluaopen_kills(lua_State *ls);     // defined in kills.cc
 void cluaopen_monsters(lua_State *ls);
 void cluaopen_options(lua_State *ls);
 void cluaopen_you(lua_State *ls);
@@ -23,7 +24,8 @@ void cluaopen_you(lua_State *ls);
 void cluaopen_globals(lua_State *ls);
 
 /*
- * Libraries and loaders, accessed from init_dungeon_lua().
+ * Libraries and loaders for dlua, accessed from init_dungeon_lua().
+ * TODO: Move these to dluaopen_*.
  */
 
 extern const struct luaL_reg debug_dlib[];
-- 
cgit v1.2.3-54-g00ecf