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

(svn r14798) -Codechange: move variable declaration to first use of variable (Alberth)

release/0.7
rubidium 2009-01-03 11:03:53 +00:00
parent 489584b85e
commit d9bc99658b
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/settings_gui.cpp
View File

@ -867,32 +867,28 @@ struct PatchesSelectionWindow : Window {
{ {
switch (widget) { switch (widget) {
case PATCHSEL_OPTIONSPANEL: { case PATCHSEL_OPTIONSPANEL: {
const PatchPage *page = &_patches_page[this->page]; int y = pt.y - SETTINGTREE_TOP_OFFSET; // Shift y coordinate
const SettingDesc *sd;
void *var;
int32 value;
int x, y;
byte btn;
y = pt.y - SETTINGTREE_TOP_OFFSET; // Shift y coordinate
if (y < 0) return; // Clicked above first entry if (y < 0) return; // Clicked above first entry
x = pt.x - SETTINGTREE_LEFT_OFFSET; // Shift x coordinate int x = pt.x - SETTINGTREE_LEFT_OFFSET; // Shift x coordinate
if (x < 0) return; // Clicked left of the entry if (x < 0) return; // Clicked left of the entry
btn = y / SETTING_HEIGHT; // Compute which setting is selected byte btn = y / SETTING_HEIGHT; // Compute which setting is selected
if (y % SETTING_HEIGHT > SETTING_HEIGHT - 2) return; // Clicked too low at the setting if (y % SETTING_HEIGHT > SETTING_HEIGHT - 2) return; // Clicked too low at the setting
const PatchPage *page = &_patches_page[this->page];
if (btn >= page->num) return; // Clicked below the last setting of the page if (btn >= page->num) return; // Clicked below the last setting of the page
sd = page->entries[btn].setting; const SettingDesc *sd = page->entries[btn].setting;
/* return if action is only active in network, or only settable by server */ /* return if action is only active in network, or only settable by server */
if (!(sd->save.conv & SLF_NETWORK_NO) && _networking && !_network_server) return; if (!(sd->save.conv & SLF_NETWORK_NO) && _networking && !_network_server) return;
if ((sd->desc.flags & SGF_NETWORK_ONLY) && !_networking) return; if ((sd->desc.flags & SGF_NETWORK_ONLY) && !_networking) return;
if ((sd->desc.flags & SGF_NO_NETWORK) && _networking) return; if ((sd->desc.flags & SGF_NO_NETWORK) && _networking) return;
var = GetVariableAddress(patches_ptr, &sd->save); void *var = GetVariableAddress(patches_ptr, &sd->save);
value = (int32)ReadValue(var, sd->save.conv); int32 value = (int32)ReadValue(var, sd->save.conv);
/* clicked on the icon on the left side. Either scroller or bool on/off */ /* clicked on the icon on the left side. Either scroller or bool on/off */
if (x < 21) { if (x < 21) {