diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2010-10-04 12:58:11 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2010-10-04 13:02:46 +0200 |
| commit | 155ff773191782c6c88c3a638bdacf328172e46c (patch) | |
| tree | c6353a32f21e070ff49ed962133041b194952baf /crawl-ref/source/branch.h | |
| parent | 185dc20a7ed60ad6ac3b28b8e1ab108fe9bf2676 (diff) | |
| download | crawl-ref-155ff773191782c6c88c3a638bdacf328172e46c.tar.gz crawl-ref-155ff773191782c6c88c3a638bdacf328172e46c.zip | |
Get rid of some more insidious longs.
Especially constructs like: long foo = x.props[].get_int()
can get you by surprise on 32 bit arches -- even worse now that most
devs are on amd64.
Item flags I typedeffed as iflags_t, as it's likely we'll have to extend
it soon, yet defining it as uint64_t now would be misleading since there
are so many places it's used in a 32 bit manner.
Diffstat (limited to 'crawl-ref/source/branch.h')
| -rw-r--r-- | crawl-ref/source/branch.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/branch.h b/crawl-ref/source/branch.h index b017491425..05c568af91 100644 --- a/crawl-ref/source/branch.h +++ b/crawl-ref/source/branch.h @@ -34,8 +34,8 @@ struct Branch int depth; int startdepth; // which level of the parent branch, // 1 for first level - unsigned long branch_flags; - unsigned long default_level_flags; + uint32_t branch_flags; + uint32_t default_level_flags; dungeon_feature_type entry_stairs; dungeon_feature_type exit_stairs; const char* shortname; // "Slime Pits" @@ -77,10 +77,10 @@ int current_level_ambient_noise(); const char *level_area_type_name(int level_type); level_area_type str_to_level_area_type(const std::string &s); -bool set_branch_flags(unsigned long flags, bool silent = false, +bool set_branch_flags(uint32_t flags, bool silent = false, branch_type branch = NUM_BRANCHES); -bool unset_branch_flags(unsigned long flags, bool silent = false, +bool unset_branch_flags(uint32_t flags, bool silent = false, branch_type branch = NUM_BRANCHES); -unsigned long get_branch_flags(branch_type branch = NUM_BRANCHES); +uint32_t get_branch_flags(branch_type branch = NUM_BRANCHES); #endif |