--- deliantra/server/include/freezethaw.h 2010/04/28 20:51:58 1.6 +++ deliantra/server/include/freezethaw.h 2010/04/29 12:24:04 1.7 @@ -205,8 +205,8 @@ 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 + bool has_value () const { return value; } + 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; } @@ -217,21 +217,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) { 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 (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 (uint32 &i) { i = get_sint64 (); } - void get (sint64 &i) { i = get_sint64 (); } + void get (uint32 &i) const { i = get_sint64 (); } + void get (sint64 &i) const { i = get_sint64 (); } - 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); + void get (region_ptr &r) const; + void get (materialtype_t *&m) 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 { attachable *op;