diff options
author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-08-06 14:47:18 +0200 |
---|---|---|
committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-08-06 14:47:18 +0200 |
commit | 1ccf0958ece7fbfde3761207f3238719e0585105 (patch) | |
tree | c2b2b0ba5bfedca8f793d35e5d3216e9c301cbf3 /scripts/lua | |
parent | 1bbf0a238b62f2c977800f539386df5af9424fff (diff) | |
parent | af59c9d650bc254683618e7b334795e5a75886b2 (diff) | |
download | manaserv-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')
-rw-r--r-- | scripts/lua/libmana.lua | 2 |
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 {} |