Author: cazfi Date: Sun Nov 8 23:52:46 2015 New Revision: 30485 URL: http://svn.gna.org/viewcvs/freeciv?rev=30485&view=rev Log: Added notify.research() functionality to lua scripting.
See patch #6545 Modified: branches/S2_6/server/scripting/api_server_notify.c branches/S2_6/server/scripting/api_server_notify.h branches/S2_6/server/scripting/tolua_server.pkg Modified: branches/S2_6/server/scripting/api_server_notify.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/scripting/api_server_notify.c?rev=30485&r1=30484&r2=30485&view=diff ============================================================================== --- branches/S2_6/server/scripting/api_server_notify.c (original) +++ branches/S2_6/server/scripting/api_server_notify.c Sun Nov 8 23:52:46 2015 @@ -17,6 +17,7 @@ /* common */ #include "featured_text.h" +#include "research.h" /* common/scriptcore */ #include "luascript.h" @@ -49,3 +50,18 @@ notify_player(pplayer, ptile, event, ftc_any, "%s", message); } +/***************************************************************************** + Notify players sharing research with the player. +*****************************************************************************/ +void api_notify_research_msg(lua_State *L, Player *pplayer, bool include_plr, + int event, const char *message) +{ + struct research *pres; + + LUASCRIPT_CHECK_STATE(L); + + pres = research_get(pplayer); + + notify_research(pres, include_plr ? NULL : pplayer, event, + ftc_any, "%s", message); +} Modified: branches/S2_6/server/scripting/api_server_notify.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/scripting/api_server_notify.h?rev=30485&r1=30484&r2=30485&view=diff ============================================================================== --- branches/S2_6/server/scripting/api_server_notify.h (original) +++ branches/S2_6/server/scripting/api_server_notify.h Sun Nov 8 23:52:46 2015 @@ -23,6 +23,7 @@ int event, const char *message); void api_notify_event_msg(lua_State *L, Player *pplayer, Tile *ptile, int event, const char *message); +void api_notify_research_msg(lua_State *L, Player *pplayer, bool include_plr, + int event, const char *message); #endif /* API_SERVER_NOTIFY */ - Modified: branches/S2_6/server/scripting/tolua_server.pkg URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/scripting/tolua_server.pkg?rev=30485&r1=30484&r2=30485&view=diff ============================================================================== --- branches/S2_6/server/scripting/tolua_server.pkg (original) +++ branches/S2_6/server/scripting/tolua_server.pkg Sun Nov 8 23:52:46 2015 @@ -57,6 +57,9 @@ void api_notify_embassies_msg @ embassies_msg (lua_State *L, Player *pplayer, Tile *ptile, int event, const char *message); + void api_notify_research_msg + @ research_msg (lua_State *L, Player *pplayer, bool include_plr, + int event, const char *message); void api_notify_event_msg @ event_msg (lua_State *L, Player *pplayer, Tile *ptile, int event, const char *message); @@ -83,6 +86,11 @@ function notify.embassies(player, ptile, event, ...) local arg = table.pack(...); notify.embassies_msg(player, ptile, event, string.format(table.unpack(arg))) +end + +function notify.research(player, selfmsg, event, ...) + local arg = table.pack(...); + notify.research_msg(player, selfmsg, event, string.format(table.unpack(arg))) end $] _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits