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 7a38642a1c
commit 1c9bec1999
75 changed files with 673 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/smallmap_gui.cpp
View File

@@ -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.