[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.9 by root, Fri May 21 00:31:13 2010 UTC

   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