aboutsummaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorcloudygoose <cloudygooseg@gmail.com>2015-06-03 10:29:41 +0800
committercloudygoose <cloudygooseg@gmail.com>2015-06-03 10:29:41 +0800
commitbf01fd6cea42def51becb6ea866d4fd335e45842 (patch)
tree09d12e50e3a6156c7e0cd7412b22fa4b61189495 /io
parent6984519cbb659aac0b0b323de93d5a90aa2049b7 (diff)
parentbb56a806e0636a0b20117b1644701d63e2bfaefb (diff)
...
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'io')
-rw-r--r--io/init.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/io/init.lua b/io/init.lua
index 7c312f4..4a663a7 100644
--- a/io/init.lua
+++ b/io/init.lua
@@ -22,7 +22,7 @@ function nerv.ChunkFile:read_chunk(id, global_conf)
if metadata == nil then
nerv.error("chunk with id %s does not exist", id)
end
- local chunk_type = assert(loadstring("return " .. metadata.type))()
+ local chunk_type = nerv.get_type(metadata.type)
local chunk = chunk_type(id, global_conf)
chunk:set_info(metadata.info)
chunk:read(self:get_chunkdata(id))