--- deliantra/server/include/freezethaw.h	2010/04/15 04:18:09	1.2
+++ deliantra/server/include/freezethaw.h	2012/01/03 11:25:31	1.12
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -165,9 +165,14 @@
   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
@@ -181,6 +186,7 @@
   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 ();
 
@@ -192,15 +198,18 @@
   // 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
 
-  bool has_value () { return value; }
-  const_utf8_string get_str () { return value_nn; } // empty string when missing
+  // returns true IFF a value was specified and it is not the empty string
+  // formerly, this just etsetd for a value, but the editor is too dumb
+  // and creates lots of empty values.
+  bool has_value () const { return *value_nn; }
+  const_utf8_string get_str () const { return value_nn; } // empty string when missing
   void get_ml (keyword kend, shstr &sh);
 
   void get_ornull (shstr &sh) const { sh = value; }
@@ -211,21 +220,24 @@
   sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); }
   double get_double () const { return strtod  (value_nn, 0); }
 
-  void get (float  &v) { v = get_double (); }
-  void get (double &v) { v = get_double (); }
+  void get (float  &v) const { v = get_double (); }
+  void get (double &v) const { v = get_double (); }
+
+  void get (bool   &i) const { i = get_bool   (); }
+  void get (sint8  &i) const { i = get_sint32 (); }
+  void get (uint8  &i) const { i = get_sint32 (); }
+  void get (sint16 &i) const { i = get_sint32 (); }
+  void get (uint16 &i) const { i = get_sint32 (); }
+  void get (sint32 &i) const { i = get_sint32 (); }
 
-  void get (bool   &i) { i = get_bool   (); }
-  void get (sint8  &i) { i = get_sint32 (); }
-  void get (uint8  &i) { i = get_sint32 (); }
-  void get (sint16 &i) { i = get_sint32 (); }
-  void get (uint16 &i) { i = get_sint32 (); }
-  void get (sint32 &i) { i = get_sint32 (); }
+  void get (uint32 &i) const { i = get_sint64 (); }
+  void get (sint64 &i) const { i = get_sint64 (); }
 
-  void get (uint32 &i) { i = get_sint64 (); }
-  void get (sint64 &i) { i = get_sint64 (); }
+  void get (region_ptr &r) const;
+  void get (materialtype_t *&mt) const;
 
-  MTH void parse_warn (const_utf8_string msg);
-  MTH bool parse_error (const_utf8_string type = 0, const_utf8_string name = 0, bool skip = true);
+  MTH void parse_warn (const_utf8_string msg) const;
+  MTH bool parse_error (const_utf8_string type = 0, const_utf8_string name = 0, bool skip = true) const;
 
   struct delayed_ref {
     attachable *op;
@@ -236,6 +248,9 @@
 
   void delayed_deref (attachable *op, object_ptr &ptr, const_utf8_string ref);
   MTH void resolve_delayed_derefs (bool deref = true);
+private:
+  void init (const_utf8_string path);
+  void init_from_file (const_utf8_string path);
 };
 
 #endif