event-handling in lua,

events mit vargs,
events für message to unit

src/common/gamecode/laws.c

@@ -1838,17 +1838,17 @@ deliverMail(faction * f, region * r, unit * u, const char *s, unit * receiver)
 static void
 mailunit(region * r, unit * u, int n, struct order * ord, const char * s)
 {
-	unit *u2;		/* nur noch an eine Unit möglich */
-
-	u2=findunitr(r,n);
+	unit * u2 = findunitr(r,n);
 
 	if (u2 && cansee(u->faction, r, u2, 0)) {
 		deliverMail(u2->faction, r, u, s, u2);
+    handle_event_va(&u2->attribs, "message", "string unit", s, u);
 	}
-	else
-		cmistake(u, ord, 63, MSG_MESSAGE);
+  else {
     /* Immer eine Meldung - sonst könnte man so getarnte EHs enttarnen:
     * keine Meldung -> EH hier. */
+    cmistake(u, ord, 63, MSG_MESSAGE);
+	}
 }
 
 static void
@@ -1927,14 +1927,14 @@ mail_cmd(unit * u, struct order * ord)
       boolean see = false;
       n = getid();
 
-      for(u2=r->units; u2; u2=u2->next) {
-        if(u2->no == n && cansee(u->faction, r, u2, 0)) {
+      for (u2=r->units; u2; u2=u2->next) {
+        if (u2->no == n && cansee(u->faction, r, u2, 0)) {
           see = true;
           break;
         }
       }
 
-      if(see == false) {
+      if (see == false) {
         cmistake(u, ord, 63, MSG_MESSAGE);
         break;
       }

src/common/kernel/eressea.c

@@ -3357,6 +3357,9 @@ freadstr(FILE * F, char * start, size_t size)
   }
 }
 
+/** writes a quoted string to the file
+ * no trailing space, since this is used to make the creport.
+ */
 int
 fwritestr(FILE * F, const char * str)
 {

src/common/util/event.c

@@ -21,6 +21,7 @@
 
 /* libc includes */
 #include <assert.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -200,7 +201,29 @@ add_trigger(struct attrib ** ap, const char * event, struct trigger * t)
 }
 
 void
-handle_event(attrib ** attribs, const char * event, void * param)
+handle_event_va(attrib ** attribs, const char * event, const char * format, ...)
+{
+  event_arg args[9];
+  int argc = 0;
+  va_list marker;
+  char * toks = strdup(format);
+  char * tok = strtok(toks, " ");
+
+  va_start(marker, format);
+  while (tok && argc!=8) {
+    args[argc].data = va_arg(marker, void *);
+    args[argc].type = tok;
+    ++argc;
+    tok = strtok(NULL, " ");
+  }
+  args[argc].type=NULL;
+  va_end(marker);
+  handle_event(attribs, event, args);
+  free (toks);
+}
+
+void
+handle_event(attrib ** attribs, const char * event, void * data)
 {
 	while (*attribs) {
 		if ((*attribs)->type==&at_eventhandler) break;
@@ -213,7 +236,7 @@ handle_event(attrib ** attribs, const char * event, void * param)
 	}
 	if (*attribs) {
 		handler_info * tl = (handler_info*)(*attribs)->data.v;
-		handle_triggers(&tl->triggers, param);
+		handle_triggers(&tl->triggers, data);
 	}
 }
 

src/common/util/event.h

@@ -44,6 +44,11 @@ typedef struct trigger {
 	variant data;
 } trigger;
 
+typedef struct event_arg {
+  char * type;
+  void * data;
+} event_arg;
+
 extern trigger * t_new(trigger_type * ttype);
 extern void t_free(trigger * t);
 extern void t_add(trigger ** tlist, trigger * t);
@@ -55,6 +60,7 @@ extern void remove_triggers(struct attrib ** ap, const char * event, const trigg
 extern struct trigger ** get_triggers(struct attrib * ap, const char * event);
 /* calls handle() for each of these. e.g. used in timeout */
 extern void handle_event(struct attrib ** attribs, const char * event, void * data);
+extern void handle_event_va(struct attrib ** attribs, const char * event, const char * format, ...);
 
 /* functions for making complex triggers: */
 extern void free_triggers(trigger * triggers); /* release all these triggers */

src/eressea/Jamfile

@@ -17,6 +17,7 @@ LUASERVER_SOURCES =
  <lua>alliance.cpp
  <lua>building.cpp
  <lua>eressea.cpp
+ <lua>event.cpp
  <lua>faction.cpp
  <lua>region.cpp
  <lua>script.cpp

src/eressea/eressea-lua.vcproj

@@ -251,6 +251,9 @@
 			<File
 				RelativePath=".\lua\eressea.cpp">
 			</File>
+			<File
+				RelativePath=".\lua\event.cpp">
+			</File>
 			<File
 				RelativePath=".\lua\faction.cpp">
 				<FileConfiguration

src/eressea/lua/bindings.h

@@ -12,5 +12,5 @@ extern void bind_alliance(struct lua_State * L);
 extern void bind_eressea(struct lua_State * L);
 extern void bind_spell(lua_State * L) ;
 extern void bind_item(struct lua_State * L);
-
+extern void bind_event(lua_State * L);
 #endif

src/eressea/lua/event.cpp

@@ -0,0 +1,51 @@
+#include <config.h>
+#include <eressea.h>
+#include "event.h"
+
+// util includes
+#include <util/base36.h>
+#include <util/event.h>
+
+// lua includes
+#include <lua.hpp>
+#include <luabind/luabind.hpp>
+
+using namespace luabind;
+
+
+const char * 
+event::get_type(int i) const 
+{ 
+  return args[i].type; 
+}
+
+struct unit * 
+event::get_unit(int i) const 
+{
+  return (struct unit *)args[i].data; 
+}
+
+const char * 
+event::get_string(int i) const 
+{ 
+  return (const char*)args[i].data; 
+}
+
+int 
+event::get_int(int i) const 
+{
+  return (int)args[i].data; 
+}
+
+void
+bind_event(lua_State * L) 
+{
+  module(L)[
+    class_<event>("event")
+      .def("message", &event::get_message)
+      .def("get_type", &event::get_type)
+      .def("get_string", &event::get_string)
+      .def("get_unit", &event::get_unit)
+      .def("get_int", &event::get_int)
+  ];
+}

src/eressea/lua/event.h

@@ -0,0 +1,15 @@
+class event {
+public:
+  event(char * m, struct event_arg * a) : args(a), msg(m) {}
+
+  const char * get_message(int i) const { return msg; }
+  const char * get_type(int i) const;
+  struct unit * get_unit(int i) const;
+  const char * get_string(int i) const;
+  int get_int(int i) const;
+
+private:
+  struct event_arg * args;
+  char * msg;
+};
+

src/eressea/lua/unit.cpp

@@ -2,6 +2,7 @@
 #include <eressea.h>
 #include "list.h"
 #include "script.h"
+#include "event.h"
 
 // Atributes includes
 #include <attributes/racename.h>
@@ -22,6 +23,7 @@
 
 // util includes
 #include <util/base36.h>
+#include <util/event.h>
 
 // lua includes
 #include <lua.hpp>
@@ -405,6 +407,57 @@ unit_weight(const struct unit& u)
   return weight(&u);
 }
 
+typedef struct fctr_data {
+  unit * target;
+  luabind::functor<void> * fptr;
+} fctr_data;
+
+static int
+fctr_handle(trigger * t, void * data)
+{
+  event * evt = new event(NULL, (event_arg*)data);
+  fctr_data * fd = (fctr_data*)t->data.v;
+  fd->fptr->operator()(fd->target, evt);
+  delete evt;
+  return 0;
+}
+
+static void
+fctr_init(trigger * t)
+{
+  t->data.v = calloc(sizeof(fctr_data), 1);
+}
+
+static void
+fctr_done(trigger * t)
+{
+  free(t->data.v);
+}
+
+static struct trigger_type tt_functor = {
+  "functor",
+  fctr_init,
+  fctr_done,
+  fctr_handle
+};
+
+static trigger *
+trigger_functor(struct unit& u, const functor<void>& f)
+{
+  luabind::functor<void> * fptr = new luabind::functor<void>(f);
+  trigger * t = t_new(&tt_functor);
+  fctr_data * td = (fctr_data*)t->data.v;
+  td->target = &u;
+  td->fptr = fptr;
+  return t;
+}
+
+static void
+unit_addhandler(struct unit& u, const char * event, const functor<void>& f)
+{
+  add_trigger(&u.attribs, event, trigger_functor(u, f));
+}
+
 static int
 unit_capacity(const struct unit& u)
 {
@@ -449,6 +502,7 @@ bind_unit(lua_State * L)
     .def("eff_skill", &unit_effskill)
     .def("set_skill", &unit_setskill)
 
+    .def("add_handler", &unit_addhandler)
     .def("set_brain", &unit_setscript)
     .def("set_racename", &unit_setracename)
     .def("add_spell", &unit_addspell)

src/eressea/server.cpp

@@ -283,6 +283,7 @@ lua_init(void)
   bind_unit(luaState);
   bind_ship(luaState);
   bind_building(luaState);
+  bind_event(luaState);
   return luaState;
 }
 

src/scripts/samples.lua

@@ -1,3 +1,41 @@
+function test_handler()
+
+  local function msg_handler(u, evt)
+    str = evt:get_string(0)
+    u2 = evt:get_unit(1)
+    print(u)
+    print(u2)
+    print(str)
+  end
+
+  plain = terraform(0, 0, "plain")
+  skill = 8
+
+  f = add_faction("enno@eressea.de", "orc", "de")
+  f.age = 20
+
+  u = add_unit(f, plain)
+  u.number = 1
+  u:add_item("money", u.number*100)
+  u:clear_orders()
+  u:add_order("NUMMER PARTEI test")
+  u:add_handler("message", msg_handler)
+  msg = "BOTSCHAFT EINHEIT " .. itoa36(u.id) .. " Du~Elf~stinken"
+
+  f = add_faction("enno@eressea.de", "elf", "de")
+  f.age = 20
+
+  u = add_unit(f, plain)
+  u.number = 1
+  u:add_item("money", u.number*100)
+  u:clear_orders()
+  u:add_order("NUMMER PARTEI eviL")
+  u:add_order(msg)
+
+  process_orders()
+  write_reports() 
+end
+
 function test_combat()
 
   plain = terraform(0, 0, "plain")
@@ -175,7 +213,8 @@ function test_parser()
   write_game("parser")
 end
 
-test_parser()
+test_handler()
+-- test_parser()
 -- test_monsters()
 -- test_combat()
 -- test_rewards()