mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r25945) -Codechange: Use member function of NewGRFInspectWindow to resolve FeatureIndex.

release/1.4
frosch 2013-11-07 18:15:32 +00:00
parent f95fa79041
commit b0c2ab4501
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/newgrf_debug_gui.cpp
View File

@ -303,6 +303,16 @@ struct NewGRFInspectWindow : Window {
this->SetDirty(); this->SetDirty();
} }
/**
* Get the feature index.
* @return the feature index
*/
uint GetFeatureIndex() const
{
uint index = ::GetFeatureIndex(this->window_number);
return index;
}
NewGRFInspectWindow(WindowDesc *desc, WindowNumber wno) : Window(desc) NewGRFInspectWindow(WindowDesc *desc, WindowNumber wno) : Window(desc)
{ {
this->CreateNestedTree(); this->CreateNestedTree();
@ -310,14 +320,14 @@ struct NewGRFInspectWindow : Window {
this->FinishInitNested(wno); this->FinishInitNested(wno);
this->vscroll->SetCount(0); this->vscroll->SetCount(0);
this->SetWidgetDisabledState(WID_NGRFI_PARENT, GetFeatureHelper(this->window_number)->GetParent(GetFeatureIndex(this->window_number)) == UINT32_MAX); this->SetWidgetDisabledState(WID_NGRFI_PARENT, GetFeatureHelper(this->window_number)->GetParent(this->GetFeatureIndex()) == UINT32_MAX);
} }
virtual void SetStringParameters(int widget) const virtual void SetStringParameters(int widget) const
{ {
if (widget != WID_NGRFI_CAPTION) return; if (widget != WID_NGRFI_CAPTION) return;
GetFeatureHelper(this->window_number)->SetStringParameters(GetFeatureIndex(this->window_number)); GetFeatureHelper(this->window_number)->SetStringParameters(this->GetFeatureIndex());
} }
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
@ -355,7 +365,7 @@ struct NewGRFInspectWindow : Window {
{ {
if (widget != WID_NGRFI_MAINPANEL) return; if (widget != WID_NGRFI_MAINPANEL) return;
uint index = GetFeatureIndex(this->window_number); uint index = this->GetFeatureIndex();
const NIFeature *nif = GetFeature(this->window_number); const NIFeature *nif = GetFeature(this->window_number);
const NIHelper *nih = nif->helper; const NIHelper *nih = nif->helper;
const void *base = nih->GetInstance(index); const void *base = nih->GetInstance(index);
@ -458,8 +468,8 @@ struct NewGRFInspectWindow : Window {
switch (widget) { switch (widget) {
case WID_NGRFI_PARENT: { case WID_NGRFI_PARENT: {
const NIHelper *nih = GetFeatureHelper(this->window_number); const NIHelper *nih = GetFeatureHelper(this->window_number);
uint index = nih->GetParent(GetFeatureIndex(this->window_number)); uint index = nih->GetParent(this->GetFeatureIndex());
::ShowNewGRFInspectWindow((GrfSpecFeature)GB(index, 24, 8), GetFeatureIndex(index), nih->GetGRFID(GetFeatureIndex(this->window_number))); ::ShowNewGRFInspectWindow((GrfSpecFeature)GB(index, 24, 8), ::GetFeatureIndex(index), nih->GetGRFID(this->GetFeatureIndex()));
break; break;
} }