diff options
| -rw-r--r-- | example/serverdata/scripts/npcs/merchant.lua | 1 | ||||
| -rw-r--r-- | src/scripting/lua.cpp | 22 |
2 files changed, 19 insertions, 4 deletions
diff --git a/example/serverdata/scripts/npcs/merchant.lua b/example/serverdata/scripts/npcs/merchant.lua index 34f309ec..23035b11 100644 --- a/example/serverdata/scripts/npcs/merchant.lua +++ b/example/serverdata/scripts/npcs/merchant.lua @@ -21,6 +21,7 @@ function Merchant(npc, ch, buy_sell_table) local rights = mana.chr_get_rights(ch); if (rights >= 128) then + mana.announce(mana.being_get_name(ch) .. " the big administrator was at my shop!", mana.being_get_name(npc)) do_message(npc, ch, "Oh mighty server administrator, how can I avoid your wrath?") elseif (rights >= 8) then do_message(npc, ch, "How can I be of assistance, sir gamemaster?") diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp index 21c4b4b8..a03bc574 100644 --- a/src/scripting/lua.cpp +++ b/src/scripting/lua.cpp @@ -1714,10 +1714,6 @@ static int chat_message(lua_State *s) GameState::sayTo(being, NULL, message); } } - else if (lua_gettop(s) == 1 && lua_isstring(s, 1)) - { - // TODO: make chatserver send a global message - } else { raiseScriptError(s, "chat_message called with incorrect parameters."); @@ -2586,6 +2582,23 @@ static int map_object_get_type(lua_State *s) return 1; } +/** + * mana.announce(text [, sender]) + * Does a global announce + */ +static int announce(lua_State *s) +{ + const char *message = luaL_checkstring(s, 1); + const char *sender = luaL_optstring(s, 2, "Server"); + + MessageOut msg(GAMSG_ANNOUNCE); + msg.writeString(message); + msg.writeInt16(0); // Announce from server so id = 0 + msg.writeString(sender); + accountHandler->send(msg); + return 0; +} + static int require_loader(lua_State *s) { // Add .lua extension (maybe only do this when it doesn't have it already) @@ -2706,6 +2719,7 @@ LuaScript::LuaScript(): { "map_object_get_bounds", &map_object_get_bounds }, { "map_object_get_name", &map_object_get_name }, { "map_object_get_type", &map_object_get_type }, + { "announce", &announce }, { NULL, NULL } }; luaL_register(mState, "mana", callbacks); |