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

(svn r7099) -Fix (r4768): When changing the selected newstation type, ensure the station size chosen is permitted. If not, pick the first valid sizes.

Browse Source
This commit is contained in:
peter1138
2006-11-07 15:25:07 +00:00
parent a254a5ea65
commit c6b4834e10
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
rail_gui.c
View File

@@ -631,6 +631,30 @@ static void HandleStationPlacement(TileIndex start, TileIndex end)
CMD_BUILD_RAILROAD_STATION | CMD_NO_WATER | CMD_AUTO | CMD_MSG(STR_100F_CAN_T_BUILD_RAILROAD_STATION)); CMD_BUILD_RAILROAD_STATION | CMD_NO_WATER | CMD_AUTO | CMD_MSG(STR_100F_CAN_T_BUILD_RAILROAD_STATION));
} }
/* Check if the currently selected station size is allowed */
static void CheckSelectedSize(Window *w, const StationSpec *statspec)
{
if (statspec == NULL || _railstation.dragdrop) return;
if (HASBIT(statspec->disallowed_platforms, _railstation.numtracks - 1)) {
RaiseWindowWidget(w, _railstation.numtracks + 4);
_railstation.numtracks = 1;
while (HASBIT(statspec->disallowed_platforms, _railstation.numtracks - 1)) {
_railstation.numtracks++;
}
LowerWindowWidget(w, _railstation.numtracks + 4);
}
if (HASBIT(statspec->disallowed_lengths, _railstation.platlength - 1)) {
RaiseWindowWidget(w, _railstation.platlength + 11);
_railstation.platlength = 1;
while (HASBIT(statspec->disallowed_lengths, _railstation.platlength - 1)) {
_railstation.platlength++;
}
LowerWindowWidget(w, _railstation.platlength + 11);
}
}
static void StationBuildWndProc(Window *w, WindowEvent *e) static void StationBuildWndProc(Window *w, WindowEvent *e)
{ {
switch (e->event) { switch (e->event) {
@@ -824,6 +848,9 @@ static void StationBuildWndProc(Window *w, WindowEvent *e)
GetStationCallback(CBID_STATION_AVAILABILITY, 0, 0, statspec, NULL, INVALID_TILE) == 0) return; GetStationCallback(CBID_STATION_AVAILABILITY, 0, 0, statspec, NULL, INVALID_TILE) == 0) return;
_railstation.station_type = y; _railstation.station_type = y;
CheckSelectedSize(w, statspec);
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
SetWindowDirty(w); SetWindowDirty(w);
break; break;
@@ -837,6 +864,8 @@ static void StationBuildWndProc(Window *w, WindowEvent *e)
_railstation.station_type = 0; _railstation.station_type = 0;
_railstation.station_count = GetNumCustomStations(_railstation.station_class); _railstation.station_count = GetNumCustomStations(_railstation.station_class);
CheckSelectedSize(w, GetCustomStationSpec(_railstation.station_class, _railstation.station_type));
w->vscroll.count = _railstation.station_count; w->vscroll.count = _railstation.station_count;
w->vscroll.pos = _railstation.station_type; w->vscroll.pos = _railstation.station_type;
} }