diff options
author | Jude Brown <bookofjude@users.sourceforge.net> | 2010-01-17 16:29:09 +1000 |
---|---|---|
committer | Jude Brown <bookofjude@users.sourceforge.net> | 2010-01-17 17:03:26 +1000 |
commit | 7cab36931b74bf99d3c6ee704a7ebf3b54d7a976 (patch) | |
tree | 663b3b75010fa4a3f27dce96095f4e6119d7e0ad /crawl-ref/source/mapdef.h | |
parent | a660d9f8bb8aefeb80345f535d48ea26af865518 (diff) | |
download | crawl-ref-7cab36931b74bf99d3c6ee704a7ebf3b54d7a976.tar.gz crawl-ref-7cab36931b74bf99d3c6ee704a7ebf3b54d7a976.zip |
Convert fprop instances in mapdef.* to unsigned long. (greensnark)
fprop lists, and fprop_spec, now use unsigned long instead of int. This
matches env.pgrid, and means that there won't be size issues in future
when we end up with more feature properties.
Diffstat (limited to 'crawl-ref/source/mapdef.h')
-rw-r--r-- | crawl-ref/source/mapdef.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h index 354109e8a1..a8a237650c 100644 --- a/crawl-ref/source/mapdef.h +++ b/crawl-ref/source/mapdef.h @@ -155,7 +155,7 @@ public: map_colour_list colours; }; -typedef std::pair<int, int> map_weighted_fprop; +typedef std::pair<unsigned long, int> map_weighted_fprop; class map_fprop_list : public std::vector<map_weighted_fprop> { public: @@ -169,12 +169,12 @@ public: { } - int get_property(); + unsigned long get_property(); public: std::string key; bool fix; - int fixed_prop; + unsigned long fixed_prop; map_fprop_list fprops; }; |