Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25282) -Add: When opening the object-build window, try to restore the last selected object (sbr).

Browse Source
This commit is contained in:
alberth 2013-05-24 19:11:30 +00:00
parent c556c0d4e7
commit f5f7c1bbd5
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/object_gui.cpp
View File

@ -44,6 +44,20 @@ class BuildObjectWindow : public PickerWindowBase {
this->vscroll->ScrollTowards(pos);
}
/**
* Tests whether the previously selected object can be selected.
* @return \c true if the selected object is available, \c false otherwise.
*/
bool CanRestoreSelectedObject()
{
if (_selected_object_index == -1) return false;
ObjectClass *sel_objclass = ObjectClass::Get(_selected_object_class);
if ((int)sel_objclass->GetSpecCount() <= _selected_object_index) return false;
return sel_objclass->GetSpec(_selected_object_index)->IsAvailable();
}
public:
BuildObjectWindow(const WindowDesc *desc, Window *w) : PickerWindowBase(w), info_height(1)
{
@ -56,7 +70,11 @@ public:
this->FinishInitNested(desc, 0);
this->SelectFirstAvailableObject(true);
if (this->CanRestoreSelectedObject()) {
this->SelectOtherObject(_selected_object_index);
} else {
this->SelectFirstAvailableObject(true);
}
assert(ObjectClass::Get(_selected_object_class)->GetUISpecCount() > 0); // object GUI should be disables elsewise
this->EnsureSelectedObjectClassIsVisible();
this->GetWidget<NWidgetMatrix>(WID_BO_OBJECT_MATRIX)->SetCount(4);