From bb4538665af0a07b3fa32610639c2cb96be7848b Mon Sep 17 00:00:00 2001 From: smatz Date: Tue, 7 Sep 2010 11:05:22 +0000 Subject: (svn r20761) -Codechange: make PlaceObject() static --- src/viewport.cpp | 40 ++++++++++++++++++++-------------------- src/viewport_func.h | 1 - 2 files changed, 20 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/viewport.cpp b/src/viewport.cpp index a883ceb8e..abef0e9f9 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -1802,6 +1802,26 @@ static bool CheckClickOnLandscape(const ViewPort *vp, int x, int y) return true; } +static void PlaceObject() +{ + Point pt; + Window *w; + + pt = GetTileBelowCursor(); + if (pt.x == -1) return; + + if (_thd.place_mode == HT_POINT) { + pt.x += 8; + pt.y += 8; + } + + _tile_fract_coords.x = pt.x & TILE_UNIT_MASK; + _tile_fract_coords.y = pt.y & TILE_UNIT_MASK; + + w = GetCallbackWnd(); + if (w != NULL) w->OnPlaceObject(pt, TileVirtXY(pt.x, pt.y)); +} + bool HandleViewportClicked(const ViewPort *vp, int x, int y) { @@ -1836,26 +1856,6 @@ bool HandleViewportClicked(const ViewPort *vp, int x, int y) return CheckClickOnLandscape(vp, x, y); } -void PlaceObject() -{ - Point pt; - Window *w; - - pt = GetTileBelowCursor(); - if (pt.x == -1) return; - - if (_thd.place_mode == HT_POINT) { - pt.x += 8; - pt.y += 8; - } - - _tile_fract_coords.x = pt.x & TILE_UNIT_MASK; - _tile_fract_coords.y = pt.y & TILE_UNIT_MASK; - - w = GetCallbackWnd(); - if (w != NULL) w->OnPlaceObject(pt, TileVirtXY(pt.x, pt.y)); -} - /** * Scrolls the viewport in a window to a given location. diff --git a/src/viewport_func.h b/src/viewport_func.h index 2b4f964ec..1e3c77107 100644 --- a/src/viewport_func.h +++ b/src/viewport_func.h @@ -58,7 +58,6 @@ void StartSpriteCombine(); void EndSpriteCombine(); bool HandleViewportClicked(const ViewPort *vp, int x, int y); -void PlaceObject(); void SetRedErrorSquare(TileIndex tile); void SetTileSelectSize(int w, int h); void SetTileSelectBigSize(int ox, int oy, int sx, int sy); -- cgit v1.2.3-70-g09d2