summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/colour.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2010-07-29 12:08:57 +0200
committerAdam Borowski <kilobyte@angband.pl>2010-07-30 18:45:16 +0200
commit558f088e9aa6ef75589cdea4ebd908c5b3985eb0 (patch)
tree498ecba031c0ce0bc21563c76866ee316d3d7f85 /crawl-ref/source/colour.h
parent4817bb3d806b3156bea1d2bc2b648f04bb0e04e5 (diff)
downloadcrawl-ref-558f088e9aa6ef75589cdea4ebd908c5b3985eb0.tar.gz
crawl-ref-558f088e9aa6ef75589cdea4ebd908c5b3985eb0.zip
Rename chars used as numbers to int8_t/uint8_t. Fix some other type usage.
This should help against the signed char problems, and is good for code readability. Now, if you have a char, it's either an untyped in-memory byte, or a symbol inside a string. Small numbers are instead [u]int8_t, ints, an enum type, or, in so many cases, bools. I didn't touch any of the tiles code, as it's currently broken and I don't want to risk making it unbroken harder.
Diffstat (limited to 'crawl-ref/source/colour.h')
-rw-r--r--crawl-ref/source/colour.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/colour.h b/crawl-ref/source/colour.h
index dd4001bf5f..afb9b6eea9 100644
--- a/crawl-ref/source/colour.h
+++ b/crawl-ref/source/colour.h
@@ -50,13 +50,13 @@ enum element_type
int str_to_colour(const std::string &str, int default_colour = -1,
bool accept_number = true);
-const std::string colour_to_str(unsigned char colour);
+const std::string colour_to_str(uint8_t colour);
unsigned int str_to_tile_colour(std::string colour);
-unsigned char random_colour();
-unsigned char random_uncommon_colour();
-unsigned char make_low_colour(unsigned char colour);
-unsigned char make_high_colour(unsigned char colour);
+uint8_t random_colour();
+uint8_t random_uncommon_colour();
+uint8_t make_low_colour(uint8_t colour);
+uint8_t make_high_colour(uint8_t colour);
bool is_element_colour(int col);
int element_colour(int element, bool no_random = false);