diff options
| author | truebrain <truebrain@openttd.org> | 2011-12-20 17:57:56 +0000 |
|---|---|---|
| committer | truebrain <truebrain@openttd.org> | 2011-12-20 17:57:56 +0000 |
| commit | 1c9bec19993417b1f3b240f2bdb0745aa26c0cb3 (patch) | |
| tree | d09407cc962ee87ac1bbbbc60951cad74c6b1db7 /src/gfx.cpp | |
| parent | 7a38642a1c83531a65907ae784bc03a82d35132a (diff) | |
| download | openttd-1c9bec19993417b1f3b240f2bdb0745aa26c0cb3.tar.xz | |
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
Diffstat (limited to 'src/gfx.cpp')
| -rw-r--r-- | src/gfx.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gfx.cpp b/src/gfx.cpp index 61fc5ea33..5bb6b38b6 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -69,7 +69,7 @@ struct DrawStringParams { * Switch to new colour \a c. * @param c New colour to use. */ - FORCEINLINE void SetColour(TextColour c) + inline void SetColour(TextColour c) { assert(c >= TC_BLUE && c <= TC_BLACK); this->prev_colour = this->cur_colour; @@ -77,7 +77,7 @@ struct DrawStringParams { } /** Switch to previous colour. */ - FORCEINLINE void SetPreviousColour() + inline void SetPreviousColour() { Swap(this->cur_colour, this->prev_colour); } @@ -86,7 +86,7 @@ struct DrawStringParams { * Switch to using a new font \a f. * @param f New font to use. */ - FORCEINLINE void SetFontSize(FontSize f) + inline void SetFontSize(FontSize f) { this->fontsize = f; } |