From 34b5209b65cca5fd20963cfa4b73d74ff67d144c Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 22 Nov 2012 17:18:04 +0000
Subject: [PATCH] StaticMap generator can handle special list for actors,
objects and traps too
git-svn-id: http://svn.net-core.org/repos/t-engine4@5818 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../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 098a0f8d93..501fbbba31 100644
--- a/game/engines/default/engine/generator/map/Static.lua
+++ b/game/engines/default/engine/generator/map/Static.lua
@@ -50,8 +50,17 @@ function _M:loadMap(file)
data = self.data,
Map = require("engine.Map"),
specialList = function(kind, files)
- assert(kind == "terrain", "kind unsupported")
- self.grid_list = self.zone.grid_class:loadList(files)
+ if kind == "terrain" then
+ self.grid_list = self.zone.grid_class:loadList(files)
+ elseif kind == "trap" then
+ self.trap_list = self.zone.trap_class:loadList(files)
+ elseif kind == "object" then
+ self.object_list = self.zone.object_class:loadList(files)
+ elseif kind == "actor" then
+ self.npc_list = self.zone.npc_class:loadList(files)
+ else
+ error("kind unsupported")
+ end
end,
subGenerator = function(g)
self.subgen[#self.subgen+1] = g
--
GitLab