Nicer map handling in lua (#164)

map no longer needs to be a global variable.

Author: LiquidityC

data/mapgen.lua

@@ -165,7 +165,7 @@ end
 -- END FUNCTIONS
 
 -- BEGIN SCRIPT
-map = create_map(CURRENT_LEVEL) -- 'map' needs to be global
+local map = create_map(CURRENT_LEVEL)
 room_builder.load_textures(map)
 local map_matrix = generate_path()
 
@@ -188,4 +188,7 @@ end
 if lockedDoorsAdded then
 	add_keybearers(map)
 end
+
+-- Finalize by returning the map
+return map
 -- END SCRIPT

data/maproombuilder.lua

@@ -35,7 +35,7 @@ local floorDecor = {}
 local blockingFloorDecor = {}
 local lightDecor = {}
 
-local function load_decor_textures()
+local function load_decor_textures(map)
 	local td0 = add_texture(map, "Objects/Decor0.png")
 	local td1 = add_texture(map, "Objects/Decor1.png")
 
@@ -107,7 +107,7 @@ local function load_decor_textures()
 	lightDecor.candle2 = { td0, td1, 32, 8 * 16, true, true }
 end
 
-local function load_special_tiles()
+local function load_special_tiles(map)
 	local tt = add_texture(map, "Objects/Tile.png")
 	special.level_exit = { tt, -1, 16, 16, false, true, true }
 end
@@ -591,8 +591,8 @@ function module.load_textures(map)
 	wall.vertical = { t_wall, -1, xo + 0, yo + 16, true }
 	wall.horizontal = { t_wall, -1, xo + 16, yo + 0, true }
 
-	load_decor_textures()
-	load_special_tiles()
+	load_decor_textures(map)
+	load_special_tiles(map)
 end
 
 return module

data/menumapgen.lua

@@ -3,7 +3,7 @@ local monster_gen = require("monstergen")
 local trap_gen = require("trapgen")
 local chest_gen = require("chestgen")
 
-map = create_map(CURRENT_LEVEL) -- 'map' needs to be global
+local map = create_map(CURRENT_LEVEL)
 
 room_builder.load_textures(map)
 
@@ -18,3 +18,5 @@ room_builder.load_room(map, room)
 monster_gen.load_monsters(map, room.monsters)
 trap_gen.load_traps(map, room.traps)
 chest_gen.load_chests(map, room.chests)
+
+return map

src/map_lua.c

@@ -74,11 +74,11 @@ luaL_checkmap(lua_State *L, int index)
 	Map *map;
 
 	if (!lua_islightuserdata(L, index))
-		fatal("in luaL_checkmap(), pointer lost in lua script");
+		fatal("pointer lost in lua script");
 
 	map = lua_touserdata(L, index);
 	if (map == NULL)
-		fatal("in luaL_checkmap(), bad map pointer");
+		fatal("bad map pointer");
 
 	return map;
 }
@@ -91,11 +91,11 @@ luaL_checksdlrenderer(lua_State *L)
 	lua_pushlightuserdata(L, &RendererKey);
 	lua_gettable(L, LUA_REGISTRYINDEX);
 	if (!lua_islightuserdata(L, -1))
-		fatal("in luaL_checksdlrenderer(), pointer lost in lua script");
+		fatal("pointer lost in lua script");
 
 	renderer = lua_touserdata(L, -1);
 	if (renderer == NULL)
-		fatal("in luaL_checksdlrenderer(), bad SDL_Renderer pointer");
+		fatal("bad SDL_Renderer pointer");
 
 	return renderer;
 }
@@ -107,7 +107,7 @@ luaL_checkplayer(lua_State *L)
 	lua_pushlightuserdata(L, &PlayerKey);
 	lua_gettable(L, LUA_REGISTRYINDEX);
 	if (!lua_islightuserdata(L, -1))
-		fatal("in luaL_checkplayer(), pointer lost in lua script");
+		fatal("pointer lost in lua script");
 
 	player = lua_touserdata(L, -1);
 	return player;
@@ -709,8 +709,7 @@ generate_map(unsigned int level, const char *file, GameMode gameMode, Player *pl
 		fatal("Failed to run script: %s\n", lua_tostring(L, -1));
 	}
 
-	lua_getglobal(L, "map");
-	Map *map = lua_touserdata(L, 1);
+	Map *map = luaL_checkmap(L, -1);
 
 	lua_close(L);