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

Comparing deliantra/server/include/freezethaw.h (file contents):
Revision 1.1 by root, Thu Apr 15 04:02:38 2010 UTC vs.
Revision 1.5 by root, Wed Apr 28 19:49:50 2010 UTC

 };
 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);
   // parse next line as keyword-value pair
   MTH void next ();
-  // parse next line, as a single value - skips initial whitespace and comments
+  // parse next line, as a single value
+  // skips initial whitespace and comments
+  // and sets kw to KW_value on success.
-  MTH void next_line ();
+  MTH bool next_line ();
   // skip the current key-value (usually fetch next line, for
   // multiline-fields, skips till the corresponding end-kw
   MTH void skip ();
   MTH void skip_block (); // skips till and over KW_end
   };
   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);
 };
-//TODO: remove
-char *fgets (char *s, int n, object_thawer &thawer);
 #endif

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