From e559be80ad3844e6c5db9aa509bd3ef5262eb41f Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Mon, 23 Jun 2014 23:06:52 +0200
Subject: [PATCH] Static Map generator can load maps from addon's data folder
---
.../engines/default/engine/generator/map/Static.lua | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/game/engines/default/engine/generator/map/Static.lua b/game/engines/default/engine/generator/map/Static.lua
index 6d54b49f8b..6711761cb7 100644
--- a/game/engines/default/engine/generator/map/Static.lua
+++ b/game/engines/default/engine/generator/map/Static.lua
@@ -42,11 +42,20 @@ function _M:init(zone, map, level, data)
self:loadMap(data.map)
end
+function _M:getMapFile(file)
+ local _, _, addon, rfile = file:find("^([^+]+)%+(.+)$")
+ if addon and rfile then
+ return "/data-"..addon.."/maps/"..rfile..".lua"
+ end
+ return "/data/maps/"..file..".lua"
+end
+
function _M:loadMap(file)
local t = {}
- print("Static generator using file", "/data/maps/"..file..".lua")
- local f, err = loadfile("/data/maps/"..file..".lua")
+ file = self:getMapFile(file)
+ print("Static generator using file", file)
+ local f, err = loadfile(file)
if not f and err then error(err) end
local g = {
level = self.level,
--
GitLab