[ViewVC] Diff of: cvs/deliantra/server/include/cfperl.h

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.79 by root, Sat Jun 9 22:54:03 2007 UTC vs.
Revision 1.90 by root, Thu Nov 8 19:43:24 2007 UTC

 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * Deliantra is free software: you can redistribute it and/or modify
- * under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your option)
+ * the Free Software Foundation, either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
+ * This program is distributed in the hope that it will be useful,
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
+ * You should have received a copy of the GNU General Public License
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 //
 // cfperl.h perl interface
 //
 #undef readdir
 #undef getprotobyname
 #undef gethostbyname
 #undef ctime
 #undef strerror
+#undef _
 // same here, massive symbol spamming
 #undef do_open
 #undef do_close
 #undef ref
 #undef random
 #undef crypt
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#define _(msg)  (msg)
+#define N_(msg) (msg)
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // some macros to simplify perl in-calls
 #define CHECK_ERROR			\
   if (SvTRUE (ERRSV))			\
     LOG (llevError, "runtime error in %s: %s\n", __func__, SvPVutf8_nolen (ERRSV));
 void cfperl_init ();
 void cfperl_main ();
 void cfperl_emergency_save ();
 void cfperl_cleanup (int make_core);
 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);
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 extern tstamp runtime; // virtual server time, excluding time jumps and lag
 extern tstamp NOW;     // real time of current server tick
 int cfperl_result_INT (int idx);
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 INTERFACE_CLASS (attachable)
-struct attachable
+struct attachable : refcnt_base
 {
   static MGVTBL vtbl;
   static unordered_vector<attachable *> mortals;
   MTH static void check_mortals ();
   enum {
     F_DESTROYED   = 0x01,
     F_DEBUG_TRACE = 0x02,
   };
+  int ACC (RW, flags);
   // object is delete'd after the refcount reaches 0
-  int ACC (RW, flags);
-  mutable int ACC (RW, refcnt);
-  MTH void refcnt_inc () const { ++refcnt; }
-  MTH void refcnt_dec () const { --refcnt; }
   MTH int refcnt_cnt () const;
   // check wether the object has died and destroy
   MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
   // destroy the object unless it was already destroyed
   void sever_self (); // sever this object from its self, if it has one.
   void optimise ();   // possibly save some memory by destroying unneeded data
   attachable ()
-  : flags (0), refcnt (0), self (0), cb (0), attach (0)
+  : flags (0), self (0), cb (0), attach (0)
   {
   }
   attachable (const attachable &src)
-  : flags (0), refcnt (0), self (0), cb (0), attach (src.attach)
+  : flags (0), self (0), cb (0), attach (src.attach)
   {
   }
-  virtual ~attachable ();
+  // set a custom key to the given value, or delete it if value = 0
+  void set_key (const char *key, const char *value = 0, bool is_utf8 = 0);
+  void set_key_text (const char *key, const char *value = 0)
+  {
+    set_key (key, value, 1);
+  }
+  void set_key_data (const char *key, const char *value = 0)
+  {
+    set_key (key, value, 0);
+  }
   attachable &operator =(const attachable &src);
   // used to _quickly_ device wether to shortcut the evaluation
   bool should_invoke (event_type event)
   // do the real refcount checking work
   void do_check ();
   // the method that does the real destroy work
   virtual void do_destroy ();
+  // destructor is protected, should not be called by anybody
+  virtual ~attachable ();
 };
 // the global object is a pseudo object that cares for the global events
 struct global : attachable
 {
 extern struct global gbl_ev;
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+INTERFACE_CLASS(object_freezer)
 struct object_freezer : dynbuf_text
 {
   AV *av;
   object_freezer ();
   void put (keyword k, const refptr<T> &v)
   {
     put (k, (T *)v);
   }
-  bool save (const char *path);
+  MTH bool save (const_octet_string path);
   char *as_string (); // like strdup
   operator bool () { return !!av; }
 };
+INTERFACE_CLASS(object_thawer)
 struct object_thawer
 {
   char *line; // current beginning of line
   SV *text; // text part
   AV *av;   // perl part
   char *kw_str; // the keyword parsed, as string
   char *value;  // the value, or 0 if no value
   char *value_nn; // the value, or the empty string if no value
   const char *name;
-  operator bool () { return !!text; }
+  operator bool () const { return !!text; }
   object_thawer (const char *path = 0);
   object_thawer (const char *data, AV *perlav);
   ~object_thawer ();
   void get (attachable *obj, int oid);
   // parse next line
-  void next ();
+  MTH void next ();
   // skip the current key-value (usually fetch next line, for
   // multiline-fields, skips till the corresponding end-kw
-  void skip ();
+  MTH void skip ();
+  MTH void skip_block (); // skips till and over KW_end
   char *get_str () { return value; } // may be 0
   void get_ml (keyword kend, shstr &sh);
   void get_ornull (shstr &sh) const { sh = value; }
   void get (sint32 &i) { i = get_sint32 (); }
   void get (uint32 &i) { i = get_sint64 (); }
   void get (sint64 &i) { i = get_sint64 (); }
+  MTH void parse_warn (const char *msg);
-  bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
+  MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
+  struct delayed_ref {
+    attachable *op;
+    object_ptr *ptr;
+    const char *ref;
+  };
+  std::vector<delayed_ref> delrefs;
+  void delayed_deref (attachable *op, object_ptr &ptr, const char *ref);
+  MTH void resolve_delayed_derefs (bool deref = true);
 };
 //TODO: remove
 char *fgets (char *s, int n, object_thawer &thawer);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/include/cfperl.h (file contents): Revision 1.79 by root, Sat Jun 9 22:54:03 2007 UTC vs. Revision 1.90 by root, Thu Nov 8 19:43:24 2007 UTC

Diff Legend

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.79 by root, Sat Jun 9 22:54:03 2007 UTC vs.
Revision 1.90 by root, Thu Nov 8 19:43:24 2007 UTC