aboutsummaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorcloudygoose <[email protected]>2015-06-02 11:14:18 +0800
committercloudygoose <[email protected]>2015-06-02 11:14:18 +0800
commit2bb2076fe12deb3bf6a38bd2e192dca06c7736e0 (patch)
tree8d0ae95e5474eb70d86a000ccc0b38df017af3e0 /io
parent5e7fcdf4e5be450927764254d492d87349e4114e (diff)
parentd0a3e02d1a25a681ac78fd66aedf63f96636f6d2 (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 8c3701e..7c312f4 100644
--- a/io/init.lua
+++ b/io/init.lua
@@ -20,7 +20,7 @@ end
function nerv.ChunkFile:read_chunk(id, global_conf)
local metadata = self.metadata[id]
if metadata == nil then
- nerv_error("chunk with id %s does not exist", id)
+ nerv.error("chunk with id %s does not exist", id)
end
local chunk_type = assert(loadstring("return " .. metadata.type))()
local chunk = chunk_type(id, global_conf)