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

(svn r12939) -Codechange: do not use the window proc to determine whether a toolbar is a rail toolbar, but use the window number.

Browse Source
This commit is contained in:
rubidium
2008-05-04 09:39:16 +00:00
parent ec931ba5c6
commit b35100e2a9
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/rail_gui.cpp
View File

@@ -748,10 +748,10 @@ void ShowBuildRailToolbar(RailType railtype, int button)
if (!ValParamRailtype(railtype)) return;
// don't recreate the window if we're clicking on a button and the window exists.
if (button < 0 || !(w = FindWindowById(WC_BUILD_TOOLBAR, 0)) || w->wndproc != BuildRailToolbWndProc) {
DeleteWindowById(WC_BUILD_TOOLBAR, 0);
if (button < 0 || !(w = FindWindowById(WC_BUILD_TOOLBAR, TRANSPORT_RAIL))) {
DeleteWindowByClass(WC_BUILD_TOOLBAR);
_cur_railtype = railtype;
w = AllocateWindowDesc(&_build_rail_desc);
w = AllocateWindowDescFront(&_build_rail_desc, TRANSPORT_RAIL);
SetupRailToolbar(railtype, w);
}
@@ -1597,8 +1597,8 @@ void ReinitGuiAfterToggleElrail(bool disable)
if (disable && _last_built_railtype == RAILTYPE_ELECTRIC) {
Window *w;
_last_built_railtype = _cur_railtype = RAILTYPE_RAIL;
w = FindWindowById(WC_BUILD_TOOLBAR, 0);
if (w != NULL && w->wndproc == BuildRailToolbWndProc) {
w = FindWindowById(WC_BUILD_TOOLBAR, TRANSPORT_RAIL);
if (w != NULL) {
SetupRailToolbar(_cur_railtype, w);
SetWindowDirty(w);
}
@@ -1648,8 +1648,8 @@ static void SetDefaultRailGui()
}
_last_built_railtype = _cur_railtype = rt;
Window *w = FindWindowById(WC_BUILD_TOOLBAR, 0);
if (w != NULL && w->wndproc == BuildRailToolbWndProc) {
Window *w = FindWindowById(WC_BUILD_TOOLBAR, TRANSPORT_RAIL);
if (w != NULL) {
SetupRailToolbar(_cur_railtype, w);
SetWindowDirty(w);
}