Mercurial > hg > openttd
changeset 15745:9b49afb33feb draft
(svn r20412) -Codechange: Replace an if by a switch in IndustryCargoesWindow::OnClick.
author | alberth <alberth@openttd.org> |
---|---|
date | Sun, 08 Aug 2010 11:02:57 +0000 |
parents | f9e8032ac213 |
children | 266f4f350e6c |
files | src/industry_gui.cpp |
diffstat | 1 files changed, 25 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -2346,33 +2346,36 @@ virtual void OnClick(Point pt, int widget, int click_count) { - if (widget != ICW_PANEL) return; + switch (widget) { + case ICW_PANEL: { + Point fieldxy, xy; + if (!CalculatePositionInWidget(pt, &fieldxy, &xy)) return; - Point fieldxy, xy; - if (!CalculatePositionInWidget(pt, &fieldxy, &xy)) return; + const CargoesField *fld = this->fields[fieldxy.y].columns + fieldxy.x; + switch (fld->type) { + case CFT_INDUSTRY: + if (fld->u.industry.ind_type < NUM_INDUSTRYTYPES) this->ComputeIndustryDisplay(fld->u.industry.ind_type); + break; - const CargoesField *fld = this->fields[fieldxy.y].columns + fieldxy.x; - switch (fld->type) { - case CFT_INDUSTRY: - if (fld->u.industry.ind_type < NUM_INDUSTRYTYPES) this->ComputeIndustryDisplay(fld->u.industry.ind_type); - break; + case CFT_CARGO: { + CargoesField *lft = (fieldxy.x > 0) ? this->fields[fieldxy.y].columns + fieldxy.x - 1 : NULL; + CargoesField *rgt = (fieldxy.x < 4) ? this->fields[fieldxy.y].columns + fieldxy.x + 1 : NULL; + CargoID cid = fld->CargoClickedAt(lft, rgt, xy); + if (cid != INVALID_CARGO) this->ComputeCargoDisplay(cid); + break; + } - case CFT_CARGO: { - CargoesField *lft = (fieldxy.x > 0) ? this->fields[fieldxy.y].columns + fieldxy.x - 1 : NULL; - CargoesField *rgt = (fieldxy.x < 4) ? this->fields[fieldxy.y].columns + fieldxy.x + 1 : NULL; - CargoID cid = fld->CargoClickedAt(lft, rgt, xy); - if (cid != INVALID_CARGO) this->ComputeCargoDisplay(cid); + case CFT_CARGO_LABEL: { + CargoID cid = fld->CargoLabelClickedAt(xy); + if (cid != INVALID_CARGO) this->ComputeCargoDisplay(cid); + break; + } + + default: + break; + } break; } - - case CFT_CARGO_LABEL: { - CargoID cid = fld->CargoLabelClickedAt(xy); - if (cid != INVALID_CARGO) this->ComputeCargoDisplay(cid); - break; - } - - default: - break; } }