dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(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)

Browse Source
This commit is contained in:
truebrain
2011-12-20 17:57:56 +00:00
parent 990045e2b3
commit aa1a0053b0
75 changed files with 673 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gfx.cpp
View File

@@ -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;
}