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

Comparing deliantra/server/include/freezethaw.h (file contents):
Revision 1.7 by root, Thu Apr 29 12:24:04 2010 UTC vs.
Revision 1.10 by root, Sat Jul 10 22:01:19 2010 UTC

   // 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
+  // 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; }
+  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; }
   void get (shstr &sh)        const { sh = value; } // might want to check for non-null here
   void get (uint32 &i) const { i = get_sint64 (); }
   void get (sint64 &i) const { i = get_sint64 (); }
   void get (region_ptr &r) const;
-  void get (materialtype_t *&m) const;
+  void get (materialtype_t *&mt) const;
   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 {
   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 init (const_utf8_string path);
-  void new_from_path (const_utf8_string path);
+  void init_from_file (const_utf8_string path);
 };
 #endif

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