summaryrefslogtreecommitdiff
path: root/scripts/lua/libmana.lua
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2012-08-06 14:47:18 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2012-08-06 14:47:18 +0200
commit1ccf0958ece7fbfde3761207f3238719e0585105 (patch)
treec2b2b0ba5bfedca8f793d35e5d3216e9c301cbf3 /scripts/lua/libmana.lua
parent1bbf0a238b62f2c977800f539386df5af9424fff (diff)
parentaf59c9d650bc254683618e7b334795e5a75886b2 (diff)
downloadmanaserv-1ccf0958ece7fbfde3761207f3238719e0585105.tar.gz
manaserv-1ccf0958ece7fbfde3761207f3238719e0585105.tar.bz2
manaserv-1ccf0958ece7fbfde3761207f3238719e0585105.tar.xz
manaserv-1ccf0958ece7fbfde3761207f3238719e0585105.zip
Merge branch 'master' into lpc2012
Conflicts: src/game-server/item.cpp
Diffstat (limited to 'scripts/lua/libmana.lua')
-rw-r--r--scripts/lua/libmana.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lua/libmana.lua b/scripts/lua/libmana.lua
index 5d3164d9..0636e491 100644
--- a/scripts/lua/libmana.lua
+++ b/scripts/lua/libmana.lua
@@ -87,7 +87,7 @@ local function mapupdate(mapid)
check_schedule(mapid)
end
--- Registers a function so that is is executed during map initialization.
+-- Registers a function so that it is executed during map initialization.
function atinit(f)
local map_id = get_map_id()
init_fun[map_id] = init_fun[map_id] or {}