Merge branch 'polyline_track_tool' into jgrpp

# Conflicts:
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/viewport.cpp
#	src/viewport_func.h
This commit is contained in:
Jonathan G Rennison
2016-04-13 21:14:47 +01:00
13 changed files with 762 additions and 166 deletions

View File

@@ -65,7 +65,7 @@ void StartSpriteCombine();
void EndSpriteCombine();
bool HandleViewportDoubleClicked(Window *w, int x, int y);
bool HandleViewportClicked(const ViewPort *vp, int x, int y);
bool HandleViewportClicked(const ViewPort *vp, int x, int y, bool double_click);
void SetRedErrorSquare(TileIndex tile);
void SetTileSelectSize(int w, int h);
void SetTileSelectBigSize(int ox, int oy, int sx, int sy);