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

(svn r24296) -Codechange: No need to pass a member variable to a member function.

release/1.3
frosch 2012-05-28 13:29:05 +00:00
parent 5eca828aa4
commit 41c8df35db
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/settings_gui.cpp
View File

@ -1026,7 +1026,7 @@ struct SettingEntry {
} }
private: private:
void DrawSetting(GameSettings *settings_ptr, const SettingDesc *sd, int x, int y, int max_x, int state, bool highlight); void DrawSetting(GameSettings *settings_ptr, int x, int y, int max_x, int state, bool highlight);
}; };
/** Data structure describing one page of settings in the settings window. */ /** Data structure describing one page of settings in the settings window. */
@ -1237,7 +1237,7 @@ uint SettingEntry::Draw(GameSettings *settings_ptr, int left, int right, int bas
switch (this->flags & SEF_KIND_MASK) { switch (this->flags & SEF_KIND_MASK) {
case SEF_SETTING_KIND: case SEF_SETTING_KIND:
if (cur_row >= first_row) { if (cur_row >= first_row) {
this->DrawSetting(settings_ptr, this->d.entry.setting, rtl ? left : x, rtl ? x : right, y, this->flags & SEF_BUTTONS_MASK, this->DrawSetting(settings_ptr, rtl ? left : x, rtl ? x : right, y, this->flags & SEF_BUTTONS_MASK,
this == selected); this == selected);
} }
cur_row++; cur_row++;
@ -1278,15 +1278,15 @@ static const void *ResolveVariableAddress(const GameSettings *settings_ptr, cons
/** /**
* Private function to draw setting value (button + text + current value) * Private function to draw setting value (button + text + current value)
* @param settings_ptr Pointer to current values of all settings * @param settings_ptr Pointer to current values of all settings
* @param sd Pointer to value description of setting to draw
* @param left Left-most position in window/panel to start drawing * @param left Left-most position in window/panel to start drawing
* @param right Right-most position in window/panel to draw * @param right Right-most position in window/panel to draw
* @param y Upper-most position in window/panel to start drawing * @param y Upper-most position in window/panel to start drawing
* @param state State of the left + right arrow buttons to draw for the setting * @param state State of the left + right arrow buttons to draw for the setting
* @param highlight Highlight entry. * @param highlight Highlight entry.
*/ */
void SettingEntry::DrawSetting(GameSettings *settings_ptr, const SettingDesc *sd, int left, int right, int y, int state, bool highlight) void SettingEntry::DrawSetting(GameSettings *settings_ptr, int left, int right, int y, int state, bool highlight)
{ {
const SettingDesc *sd = this->d.entry.setting;
const SettingDescBase *sdb = &sd->desc; const SettingDescBase *sdb = &sd->desc;
const void *var = ResolveVariableAddress(settings_ptr, sd); const void *var = ResolveVariableAddress(settings_ptr, sd);
bool editable = true; bool editable = true;