Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-09 19:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r27187) -Fix: Code style.

Browse Source
This commit is contained in:
frosch 2015-03-15 12:19:58 +00:00
parent ab048fdcd1
commit aef1cf42e1
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ai/ai_gui.cpp
View File

@ -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 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 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. 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. int redraw_timer; ///< Timer for redrawing the window, otherwise it'll happen every tick.

12
src/fontcache.cpp
View File

@ -536,8 +536,8 @@ const Sprite *FreeTypeFontCache::GetGlyph(GlyphID key)
aa = (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY); 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 */ /* 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)); uint width = max(1U, (uint)slot->bitmap.width + (this->fs == FS_NORMAL));
unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL)); uint height = max(1U, (uint)slot->bitmap.rows + (this->fs == FS_NORMAL));
/* Limit glyph size to prevent overflows later on. */ /* Limit glyph size to prevent overflows later on. */
if (width > 256 || height > 256) usererror("Font glyph is too large"); 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 */ /* Draw shadow for medium size */
if (this->fs == FS_NORMAL && !aa) { if (this->fs == FS_NORMAL && !aa) {
for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { for (uint y = 0; y < (uint)slot->bitmap.rows; y++) {
for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { 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))) { 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].m = SHADOW_COLOUR;
sprite.data[1 + x + (1 + y) * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF; 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 (uint y = 0; y < (uint)slot->bitmap.rows; y++) {
for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { 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))) { 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].m = FACE_COLOUR;
sprite.data[x + y * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF; sprite.data[x + y * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF;

2
src/townname.cpp
View File

@ -635,7 +635,7 @@ static char *MakeCzechTownName(char *buf, const char *last, uint32 seed)
choose = _name_czech_subst_full[stem].choose; choose = _name_czech_subst_full[stem].choose;
allow = _name_czech_subst_full[stem].allow; allow = _name_czech_subst_full[stem].allow;
} else { } else {
unsigned int map[lengthof(_name_czech_subst_ending)]; uint map[lengthof(_name_czech_subst_ending)];
int ending_start = -1, ending_stop = -1; int ending_start = -1, ending_stop = -1;
/* Load the substantive */ /* Load the substantive */