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/smallmap_gui.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/smallmap_gui.cpp')
| -rw-r--r-- | src/smallmap_gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index 2c43c33de..a04693f1a 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -598,7 +598,7 @@ class SmallMapWindow : public Window { static const uint8 FORCE_REFRESH_PERIOD = 0x1F; ///< map is redrawn after that many ticks uint8 refresh; ///< refresh counter, zeroed every FORCE_REFRESH_PERIOD ticks - FORCEINLINE Point SmallmapRemapCoords(int x, int y) const + inline Point SmallmapRemapCoords(int x, int y) const { Point pt; pt.x = (y - x) * 2; @@ -612,7 +612,7 @@ class SmallMapWindow : public Window { * @param tile_y Y coordinate of the tile. * @return Position to draw on. */ - FORCEINLINE Point RemapTile(int tile_x, int tile_y) const + inline Point RemapTile(int tile_x, int tile_y) const { int x_offset = tile_x - this->scroll_x / (int)TILE_SIZE; int y_offset = tile_y - this->scroll_y / (int)TILE_SIZE; @@ -636,7 +636,7 @@ class SmallMapWindow : public Window { * @return Tile being displayed at the given position relative to #scroll_x and #scroll_y. * @note The #subscroll offset is already accounted for. */ - FORCEINLINE Point PixelToTile(int px, int py, int *sub, bool add_sub = true) const + inline Point PixelToTile(int px, int py, int *sub, bool add_sub = true) const { if (add_sub) px += this->subscroll; // Total horizontal offset. |