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

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.50 by root, Tue Jan 9 21:32:42 2007 UTC vs.
Revision 1.53 by root, Thu Feb 1 19:15:39 2007 UTC

   static unordered_vector<attachable *> mortals;
   MTH static void check_mortals ();
   enum {
     F_DESTROYED = 0x01,
-    F_BORROWED  = 0x02,
   };
   // object is delete'd after the refcount reaches 0
   mutable int ACC (RW, refcnt);
   int ACC (RW, flags);
   HV *self;     // CF+ perl self
   AV *cb;       // CF+ callbacks
   shstr attach; // generic extension attachment information
+  void sever_self (); // sever this object from its self, if it has one.
-  void optimise ();  // possibly save some memory by destroying unneeded data
+  void optimise ();   // possibly save some memory by destroying unneeded data
   attachable ()
   : flags (0), refcnt (0), self (0), cb (0), attach (0)
   {
   }
 struct object_thawer
 {
   SV *text; // text part
   AV *av;   // perl part
+  int linenum;
   char *line; // current beginning of line
   char *last_keyword, *last_value;
   const char *name;
   operator bool () { return !!text; }
   void get (uint16 &i) { i = get_sint32 (); }
   void get (sint32 &i) { i = get_sint32 (); }
   void get (uint32 &i) { i = get_sint64 (); }
   void get (sint64 &i) { i = get_sint64 (); }
-};
+  bool parse_error (keyword kw, const char *type = 0, const char *name = 0, bool skip = true);
+};
+//TODO: remove
 char *fgets (char *s, int n, object_thawer &thawer);
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 struct coroapi {

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