mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r8990) -Fix: more indenting and variable scoping

This commit is contained in:
peter1138 2007-03-03 10:48:25 +00:00
parent 8f2a554864
commit db2f57e3a1
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/bridge_gui.cpp
View File

@ -41,40 +41,38 @@ static void BuildBridge(Window *w, int i)
static void BuildBridgeWndProc(Window *w, WindowEvent *e) static void BuildBridgeWndProc(Window *w, WindowEvent *e)
{ {
switch (e->event) { switch (e->event) {
case WE_PAINT: { case WE_PAINT:
uint i; DrawWindowWidgets(w);
DrawWindowWidgets(w); for (uint i = 0; i < 4 && i + w->vscroll.pos < _bridgedata.count; i++) {
const Bridge *b = &_bridge[_bridgedata.indexes[i + w->vscroll.pos]];
for (i = 0; i < 4 && i + w->vscroll.pos < _bridgedata.count; i++) { SetDParam(2, _bridgedata.costs[i + w->vscroll.pos]);
const Bridge *b = &_bridge[_bridgedata.indexes[i + w->vscroll.pos]]; SetDParam(1, b->speed * 10 / 16);
SetDParam(0, b->material);
DrawSprite(b->sprite, b->pal, 3, 15 + i * 22);
SetDParam(2, _bridgedata.costs[i + w->vscroll.pos]); DrawString(44, 15 + i * 22 , STR_500D, 0);
SetDParam(1, b->speed * 10 / 16); }
SetDParam(0, b->material); break;
DrawSprite(b->sprite, b->pal, 3, 15 + i * 22);
DrawString(44, 15 + i * 22 , STR_500D, 0); case WE_KEYPRESS: {
} uint i = e->we.keypress.keycode - '1';
} break; if (i < 9 && i < _bridgedata.count) {
e->we.keypress.cont = false;
BuildBridge(w, i);
}
case WE_KEYPRESS: { break;
uint i = e->we.keypress.keycode - '1';
if (i < 9 && i < _bridgedata.count) {
e->we.keypress.cont = false;
BuildBridge(w, i);
} }
break; case WE_CLICK:
} if (e->we.click.widget == 2) {
uint ind = ((int)e->we.click.pt.y - 14) / 22;
case WE_CLICK: if (ind < 4 && (ind += w->vscroll.pos) < _bridgedata.count)
if (e->we.click.widget == 2) { BuildBridge(w, ind);
uint ind = ((int)e->we.click.pt.y - 14) / 22; }
if (ind < 4 && (ind += w->vscroll.pos) < _bridgedata.count) break;
BuildBridge(w, ind);
}
break;
} }
} }
@ -134,12 +132,11 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, byte bridge_type)
errmsg = _error_message; errmsg = _error_message;
} else { } else {
// check which bridges can be built // check which bridges can be built
int bridge_len; // length of the middle parts of the bridge
int tot_bridgedata_len; // total length of bridge
// get absolute bridge length // get absolute bridge length
bridge_len = GetBridgeLength(start, end); // length of the middle parts of the bridge
tot_bridgedata_len = bridge_len + 2; int bridge_len = GetBridgeLength(start, end);
// total length of bridge
int tot_bridgedata_len = bridge_len + 2;
tot_bridgedata_len = CalcBridgeLenCostFactor(tot_bridgedata_len); tot_bridgedata_len = CalcBridgeLenCostFactor(tot_bridgedata_len);