gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r14030) -Fix (r14027): true != false, also rename the parameter to make 'true' and 'false' more intuitively useable.

Browse Source
This commit is contained in:
frosch 2008-08-09 11:04:42 +00:00
parent 815f08982a
commit 92afb4d9bd
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gfx.cpp
View File

@ -677,7 +677,7 @@ uint DrawStringMultiLine(int x, int y, StringID str, int maxw, int maxh)
src = buffer; src = buffer;
for (;;) { for (;;) {
DoDrawString(src, x, y, 0xFE, false); DoDrawString(src, x, y, 0xFE, true);
_cur_fontsize = _last_fontsize; _cur_fontsize = _last_fontsize;
for (;;) { for (;;) {
@ -770,14 +770,16 @@ void DrawCharCentered(WChar c, int x, int y, uint16 real_color)
* @param y Offset from top side of the screen, if negative offset from the bottom * @param y Offset from top side of the screen, if negative offset from the bottom
* @param real_colour Colour of the string, see _string_colormap in * @param real_colour Colour of the string, see _string_colormap in
* table/palettes.h or docs/ottd-colourtext-palette.png or the enum TextColour in gfx_type.h * table/palettes.h or docs/ottd-colourtext-palette.png or the enum TextColour in gfx_type.h
* @param multiline_skipping By default, always test the available space where to draw the string. * @param parse_string_also_when_clipped
When in multipline drawing, it would already be done, * By default, always test the available space where to draw the string.
so no need to re-perform the same kind (more or less) of verifications. * When in multipline drawing, it would already be done,
It's not only an optimisation, it's also a way to ensures the string will be parsed * so no need to re-perform the same kind (more or less) of verifications.
* It's not only an optimisation, it's also a way to ensures the string will be parsed
* (as there are certain side effects on global variables, which are important for the next line)
* @return the x-coordinates where the drawing has finished. * @return the x-coordinates where the drawing has finished.
* If nothing is drawn, the originally passed x-coordinate is returned * If nothing is drawn, the originally passed x-coordinate is returned
*/ */
int DoDrawString(const char *string, int x, int y, uint16 real_colour, bool multiline_skipping) int DoDrawString(const char *string, int x, int y, uint16 real_colour, bool parse_string_also_when_clipped)
{ {
DrawPixelInfo *dpi = _cur_dpi; DrawPixelInfo *dpi = _cur_dpi;
FontSize size = _cur_fontsize; FontSize size = _cur_fontsize;
@ -787,7 +789,7 @@ int DoDrawString(const char *string, int x, int y, uint16 real_colour, bool mult
byte colour = real_colour & 0xFF; // extract the 8 bits colour index that is required for the mapping byte colour = real_colour & 0xFF; // extract the 8 bits colour index that is required for the mapping
byte previous_colour = colour; byte previous_colour = colour;
if (!multiline_skipping) { if (!parse_string_also_when_clipped) {
/* in "mode multiline", the available space have been verified. Not in regular one. /* in "mode multiline", the available space have been verified. Not in regular one.
* So if the string cannot be drawn, return the original start to say so.*/ * So if the string cannot be drawn, return the original start to say so.*/
if (x >= dpi->left + dpi->width || if (x >= dpi->left + dpi->width ||

2
src/gfx_func.h
View File

@ -87,7 +87,7 @@ int DoDrawStringCentered(int x, int y, const char *str, uint16 color);
int DrawString(int x, int y, StringID str, uint16 color); int DrawString(int x, int y, StringID str, uint16 color);
int DrawStringTruncated(int x, int y, StringID str, uint16 color, uint maxw); int DrawStringTruncated(int x, int y, StringID str, uint16 color, uint maxw);
int DoDrawString(const char *string, int x, int y, uint16 real_colour, bool multiline_skipping = false); int DoDrawString(const char *string, int x, int y, uint16 real_colour, bool parse_string_also_when_clipped = false);
int DoDrawStringTruncated(const char *str, int x, int y, uint16 color, uint maxw); int DoDrawStringTruncated(const char *str, int x, int y, uint16 color, uint maxw);
void DrawStringCenterUnderline(int x, int y, StringID str, uint16 color); void DrawStringCenterUnderline(int x, int y, StringID str, uint16 color);