diff options
| author | smatz <smatz@openttd.org> | 2009-05-18 16:21:28 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-05-18 16:21:28 +0000 |
| commit | 8808f3beea881af5652716c883a21c8031b5e390 (patch) | |
| tree | bc14c65d1e66c407b72d254fc926d105eea2f1e4 /src/tunnelbridge_cmd.cpp | |
| parent | 5fe906e14992f7a301ae94c357e80af076ab7a63 (diff) | |
| download | openttd-8808f3beea881af5652716c883a21c8031b5e390.tar.xz | |
(svn r16352) -Codechange: use PoolItem::GetIfValid() instead of PoolItem::IsValidID() and PoolItem::Get()
Diffstat (limited to 'src/tunnelbridge_cmd.cpp')
| -rw-r--r-- | src/tunnelbridge_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index ac3ff0005..489e5a8ed 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -440,11 +440,11 @@ not_valid_below:; * It's unnecessary to execute this command every time for every bridge. So it is done only * and cost is computed in "bridge_gui.c". For AI, Towns this has to be of course calculated */ - if (!(flags & DC_QUERY_COST) || (Company::IsValidID(_current_company) && Company::Get(_current_company)->is_ai)) { + Company *c = Company::GetIfValid(_current_company); + if (!(flags & DC_QUERY_COST) || (c != NULL && c->is_ai)) { bridge_len += 2; // begin and end tiles/ramps - if (Company::IsValidID(_current_company)) - bridge_len = CalcBridgeLenCostFactor(bridge_len); + if (c != NULL) bridge_len = CalcBridgeLenCostFactor(bridge_len); cost.AddCost((int64)bridge_len * _price.build_bridge * GetBridgeSpec(bridge_type)->price >> 8); |