--- deliantra/server/include/cfperl.h	2009/01/08 04:35:04	1.104
+++ deliantra/server/include/cfperl.h	2009/11/03 23:44:20	1.109
@@ -1,22 +1,21 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -85,10 +84,13 @@
   if (SvTRUE (ERRSV))			\
     LOG (llevError, "runtime error in %s: %s", __func__, SvPVutf8_nolen (ERRSV));
 
+inline int call_pvsv (const char *ob, I32 flags) { return call_pv (ob, flags); }
+inline int call_pvsv (SV         *ob, I32 flags) { return call_sv (ob, flags); }
+
 #define CALL_BEGIN(args) dSP; ENTER; SAVETMPS; PUSHMARK (SP); EXTEND (SP, args)
 #define CALL_ARG_SV(sv) PUSHs (sv_2mortal (sv)) // separate because no refcount inc
 #define CALL_ARG(expr) PUSHs (sv_2mortal (to_sv (expr)))
-#define CALL_CALL(name, flags) PUTBACK; int count = call_pv (name, (flags) | G_EVAL); SPAGAIN;
+#define CALL_CALL(name, flags) PUTBACK; int count = call_pvsv (name, (flags) | G_EVAL); SPAGAIN;
 #define CALL_END PUTBACK; CHECK_ERROR; FREETMPS; LEAVE
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -101,7 +103,11 @@
 void cfperl_make_book (object *book, int level);
 void cfperl_send_msg (client *ns, int color, const char *type, const char *msg);
 int cfperl_can_merge (object *ob1, object *ob2);
-void cfperl_mapscript_activate (object *ob, bool state, object *activator, object *originator = 0);
+void cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator = 0);
+
+bool is_match_expr (const char *expr);
+/* applies the match expression and returns true if it matches */
+bool match (const char *expr, object *ob, object *self = 0, object *source = 0, object *originator = 0);
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////