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

(svn r14919) -Feature: distant joining of stations (Frostregen and PhilSophus)

Browse Source
This commit is contained in:
rubidium
2009-01-08 16:35:45 +00:00
parent b34b386588
commit c8c61e36bd
19 changed files with 420 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/viewport.cpp
View File

@@ -2175,11 +2175,17 @@ void UpdateTileSelection()
/* clear the old selection? */
if (_thd.drawstyle) SetSelectionTilesDirty();
_thd.drawstyle = _thd.new_drawstyle;
_thd.pos = _thd.new_pos;
_thd.size = _thd.new_size;
if (!_thd.lock_pos) {
_thd.pos = _thd.new_pos;
_thd.drawstyle = _thd.new_drawstyle;
}
if (!_thd.lock_size) {
_thd.size = _thd.new_size;
_thd.dirty = 0xff;
}
_thd.outersize = _thd.new_outersize;
_thd.dirty = 0xff;
/* draw the new selection? */
if (_thd.new_drawstyle) SetSelectionTilesDirty();
@@ -2619,7 +2625,7 @@ calc_heightdiff_single_direction:;
y = sy + Clamp(y - sy, -limit, limit);
} /* Fallthrough */
case VPM_X_AND_Y: { /* drag an X by Y area */
if (_settings_client.gui.measure_tooltip) {
if (_settings_client.gui.measure_tooltip && !_thd.lock_size) {
static const StringID measure_strings_area[] = {
STR_NULL, STR_NULL, STR_MEASURE_AREA, STR_MEASURE_AREA_HEIGHTDIFF
};
@@ -2713,6 +2719,10 @@ void SetObjectToPlaceWnd(CursorID icon, SpriteID pal, ViewportHighlightMode mode
void SetObjectToPlace(CursorID icon, SpriteID pal, ViewportHighlightMode mode, WindowClass window_class, WindowNumber window_num)
{
/* unlock position and size */
_thd.lock_pos = false;
_thd.lock_size = false;
/* undo clicking on button and drag & drop */
if (_thd.place_mode != VHM_NONE || _special_mouse_mode == WSM_DRAGDROP) {
Window *w = FindWindowById(_thd.window_class, _thd.window_number);