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

Comparing deliantra/server/include/freezethaw.h (file contents):
Revision 1.3 by root, Thu Apr 15 04:56:47 2010 UTC vs.
Revision 1.6 by root, Wed Apr 28 20:51:58 2010 UTC

   utf8_string as_string (); // like strdup
   operator bool () { return !!av; }
 };
+// used as dir argument to object_thawer constructor
+#define RESOURCE_DIR const_utf8_string (0)
 INTERFACE_CLASS(object_thawer)
 struct object_thawer
 {
+  static bool errors_are_fatal; // true during server startup only
   char *line; // current beginning of line
   SV *text; // text part
   AV *av;   // perl part
   int linenum;
   keyword kw;
   const char *name;
   operator bool () const { return !!text; }
   object_thawer (const_utf8_string path = 0);
+  object_thawer (const_utf8_string dir, const_utf8_string file);
   object_thawer (const_utf8_string data, AV *perlav);
   ~object_thawer ();
   void get (attachable *obj, int oid);
   };
   std::vector<delayed_ref> delrefs;
   void delayed_deref (attachable *op, object_ptr &ptr, const_utf8_string ref);
   MTH void resolve_delayed_derefs (bool deref = true);
+private:
+  void new_from_path (const_utf8_string path);
 };
 #endif

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