summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ai/ai_gui.cpp2
-rw-r--r--src/fontcache.cpp12
-rw-r--r--src/townname.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index 082123685..0c557d790 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -970,7 +970,7 @@ struct AIDebugWindow : public Window {
static const int top_offset; ///< Offset of the text at the top of the WID_AID_LOG_PANEL.
static const int bottom_offset; ///< Offset of the text at the bottom of the WID_AID_LOG_PANEL.
- static const unsigned int MAX_BREAK_STR_STRING_LENGTH = 256; ///< Maximum length of the break string.
+ static const uint MAX_BREAK_STR_STRING_LENGTH = 256; ///< Maximum length of the break string.
static CompanyID ai_debug_company; ///< The AI that is (was last) being debugged.
int redraw_timer; ///< Timer for redrawing the window, otherwise it'll happen every tick.
diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index 4928b5377..6bea59c10 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -536,8 +536,8 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
aa = (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY);
/* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */
- unsigned int width = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL));
- unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL));
+ uint width = max(1U, (uint)slot->bitmap.width + (this->fs == FS_NORMAL));
+ uint height = max(1U, (uint)slot->bitmap.rows + (this->fs == FS_NORMAL));
/* Limit glyph size to prevent overflows later on. */
if (width > 256 || height > 256) usererror("Font glyph is too large");
@@ -553,8 +553,8 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
/* Draw shadow for medium size */
if (this->fs == FS_NORMAL && !aa) {
- for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) {
- for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) {
+ for (uint y = 0; y < (uint)slot->bitmap.rows; y++) {
+ for (uint x = 0; x < (uint)slot->bitmap.width; x++) {
if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) {
sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR;
sprite.data[1 + x + (1 + y) * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF;
@@ -563,8 +563,8 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
}
}
- for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) {
- for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) {
+ for (uint y = 0; y < (uint)slot->bitmap.rows; y++) {
+ for (uint x = 0; x < (uint)slot->bitmap.width; x++) {
if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) {
sprite.data[x + y * sprite.width].m = FACE_COLOUR;
sprite.data[x + y * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF;
diff --git a/src/townname.cpp b/src/townname.cpp
index f3a4e5cbb..2067fa1bb 100644
--- a/src/townname.cpp
+++ b/src/townname.cpp
@@ -635,7 +635,7 @@ static char *MakeCzechTownName(char *buf, const char *last, uint32 seed)
choose = _name_czech_subst_full[stem].choose;
allow = _name_czech_subst_full[stem].allow;
} else {
- unsigned int map[lengthof(_name_czech_subst_ending)];
+ uint map[lengthof(_name_czech_subst_ending)];
int ending_start = -1, ending_stop = -1;
/* Load the substantive */