diff options
Diffstat (limited to 'crawl-ref/source/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 316f8e1c90..a7a7887402 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -1944,14 +1944,14 @@ int place_depth(unsigned short place) return lev == 0xFF? -1 : lev; } -unsigned short get_packed_place( unsigned char branch, int subdepth, - char level_type ) +unsigned short get_packed_place( branch_type branch, int subdepth, + level_area_type level_type ) { unsigned short place = (unsigned short) - ( (branch << 8) | (subdepth & 0xFF) ); + ( (static_cast<int>(branch) << 8) | (subdepth & 0xFF) ); if (level_type == LEVEL_ABYSS || level_type == LEVEL_PANDEMONIUM || level_type == LEVEL_LABYRINTH) - place = (unsigned short) ( (level_type << 8) | 0xFF ); + place = (unsigned short) ( (static_cast<int>(level_type) << 8) | 0xFF ); return place; } |