--- deliantra/server/include/cfperl.h	2007/01/23 03:56:45	1.51
+++ deliantra/server/include/cfperl.h	2007/02/11 01:38:48	1.54
@@ -132,7 +132,8 @@
   MTH static void check_mortals ();
 
   enum {
-    F_DESTROYED = 0x01,
+    F_DESTROYED   = 0x01,
+    F_DEBUG_TRACE = 0x02,
   };
 
   // object is delete'd after the refcount reaches 0
@@ -166,7 +167,8 @@
   AV *cb;       // CF+ callbacks
   shstr attach; // generic extension attachment information
 
-  void optimise ();  // possibly save some memory by destroying unneeded data
+  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)
@@ -341,6 +343,7 @@
 {
   SV *text; // text part
   AV *av;   // perl part
+  int linenum;
   char *line; // current beginning of line
   char *last_keyword, *last_value;
   const char *name;
@@ -378,8 +381,11 @@
 
   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);
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////