0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

"real" removal of the gamma slider leftovers...

Browse source 
...(slightly related to the fix for bug #33148 since the mess is
getting cleaned up now...)
This commit is contained in:
Nils Kneuper 2009-02-28 16:12:49 +00:00
parent 17efb665c3
commit 94db27b43a
7 changed files with 6 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/game_preferences_display.cpp
View file

@ -92,7 +92,7 @@ private:
//
// change
gui::slider music_slider_, sound_slider_, UI_sound_slider_, bell_slider_,
scroll_slider_, gamma_slider_, chat_lines_slider_,
scroll_slider_, chat_lines_slider_,
buffer_size_slider_, idle_anim_slider_, autosavemax_slider_;
gui::list_slider<double> turbo_slider_;
gui::button fullscreen_button_, scroll_to_action_button_,turbo_button_, show_ai_moves_button_,
@ -108,7 +108,7 @@ private:
turn_dialog_button_, turn_bell_button_,
show_team_colours_button_, show_colour_cursors_button_,
show_haloing_button_, video_mode_button_,
theme_button_, hotkeys_button_, gamma_button_,
theme_button_, hotkeys_button_,
flip_time_button_, advanced_button_, sound_button_,
music_button_, chat_timestamp_button_,
advanced_sound_button_, normal_sound_button_,
@ -116,7 +116,7 @@ private:
sample_rate_button2_, sample_rate_button3_,
confirm_sound_button_, idle_anim_button_;
gui::label music_label_, sound_label_, UI_sound_label_, bell_label_,
scroll_label_, gamma_label_, chat_lines_label_,
scroll_label_, chat_lines_label_,
turbo_slider_label_, sample_rate_label_, buffer_size_label_,
idle_anim_slider_label_, autosavemax_slider_label_;
gui::textbox sample_rate_input_, friends_input_;
@ -142,7 +142,7 @@ preferences_dialog::preferences_dialog(display& disp, const config& game_cfg)
friends_names_(),
music_slider_(disp.video()), sound_slider_(disp.video()),
UI_sound_slider_(disp.video()), bell_slider_(disp.video()),
scroll_slider_(disp.video()), gamma_slider_(disp.video()),
scroll_slider_(disp.video()),
chat_lines_slider_(disp.video()), buffer_size_slider_(disp.video()),
idle_anim_slider_(disp.video()), autosavemax_slider_(disp.video()),
turbo_slider_(disp.video()),
@ -176,7 +176,6 @@ preferences_dialog::preferences_dialog(display& disp, const config& game_cfg)
video_mode_button_(disp.video(), _("Change Resolution")),
theme_button_(disp.video(), _("Theme")),
hotkeys_button_(disp.video(), _("Hotkeys")),
gamma_button_(disp.video(), _("Adjust Gamma"), gui::button::TYPE_CHECK),
flip_time_button_(disp.video(), _("Reverse Time Graphics"), gui::button::TYPE_CHECK),
advanced_button_(disp.video(), "", gui::button::TYPE_CHECK),
sound_button_(disp.video(), _("Sound effects"), gui::button::TYPE_CHECK),
@ -194,7 +193,7 @@ preferences_dialog::preferences_dialog(display& disp, const config& game_cfg)
music_label_(disp.video(), _("Music Volume:")), sound_label_(disp.video(), _("SFX Volume:")),
UI_sound_label_(disp.video(), _("UI Sound Volume:")),
bell_label_(disp.video(), _("Bell Volume:")), scroll_label_(disp.video(), _("Scroll Speed:")),
gamma_label_(disp.video(), _("Gamma:")), chat_lines_label_(disp.video(), ""),
chat_lines_label_(disp.video(), ""),
turbo_slider_label_(disp.video(), "", font::SIZE_SMALL ),
sample_rate_label_(disp.video(), _("Sample Rate (Hz):")), buffer_size_label_(disp.video(), ""),
idle_anim_slider_label_(disp.video(), _("Frequency:")),
@ -286,14 +285,6 @@ preferences_dialog::preferences_dialog(display& disp, const config& game_cfg)
chat_timestamp_button_.set_check(chat_timestamping());
chat_timestamp_button_.set_help_string(_("Add a timestamp to chat messages"));
gamma_button_.set_check(adjust_gamma());
gamma_button_.set_help_string(_("Change the brightness of the display"));
gamma_slider_.set_min(50);
gamma_slider_.set_max(200);
gamma_slider_.set_value(gamma());
gamma_slider_.set_help_string(_("Change the brightness of the display"));
fullscreen_button_.set_check(fullscreen());
fullscreen_button_.set_help_string(_("Choose whether the game should run full screen or in a window"));
@ -402,10 +393,6 @@ preferences_dialog::preferences_dialog(display& disp, const config& game_cfg)
set_friends_menu();
}
/**
* @todo the gamma correction seems to cause quite some bugs and the feature
* seems a bit useless so disable the code to evaluate the usefulness.
*/
handler_vector preferences_dialog::handler_members()
{
handler_vector h;
@ -414,7 +401,6 @@ handler_vector preferences_dialog::handler_members()
h.push_back(&bell_slider_);
h.push_back(&UI_sound_slider_);
h.push_back(&scroll_slider_);
// h.push_back(&gamma_slider_);
h.push_back(&chat_lines_slider_);
h.push_back(&turbo_slider_);
h.push_back(&idle_anim_slider_);
@ -451,7 +437,6 @@ handler_vector preferences_dialog::handler_members()
h.push_back(&video_mode_button_);
h.push_back(&theme_button_);
h.push_back(&hotkeys_button_);
// h.push_back(&gamma_button_);
h.push_back(&flip_time_button_);
h.push_back(&advanced_button_);
h.push_back(&sound_button_);
@ -468,7 +453,6 @@ handler_vector preferences_dialog::handler_members()
h.push_back(&bell_label_);
h.push_back(&UI_sound_label_);
h.push_back(&scroll_label_);
// h.push_back(&gamma_label_);
h.push_back(&turbo_slider_label_);
h.push_back(&idle_anim_slider_label_);
h.push_back(&autosavemax_slider_label_);
@ -528,13 +512,6 @@ void preferences_dialog::update_location(SDL_Rect const &rect)
// Display tab
ypos = rect.y + top_border;
// gamma_button_.set_location(rect.x, ypos);
// ypos += short_interline;
// gamma_label_.set_location(rect.x, ypos);
// SDL_Rect gamma_rect = { rect.x + gamma_label_.width(), ypos,
// rect.w - gamma_label_.width() - right_border, 0 };
// gamma_slider_.set_location(gamma_rect);
// ypos += item_interline;
fullscreen_button_.set_location(rect.x, ypos);
ypos += item_interline; scroll_to_action_button_.set_location(rect.x, ypos);
ypos += item_interline; show_colour_cursors_button_.set_location(rect.x, ypos);
@ -730,12 +707,6 @@ void preferences_dialog::process_event()
set_colour_cursors(show_colour_cursors_button_.checked());
if (show_haloing_button_.pressed())
set_show_haloes(show_haloing_button_.checked());
if (gamma_button_.pressed()) {
set_adjust_gamma(gamma_button_.checked());
const bool enable_gamma = adjust_gamma();
gamma_slider_.enable(enable_gamma);
gamma_label_.enable(enable_gamma);
}
if (flip_time_button_.pressed())
set_flip_time(flip_time_button_.checked());
if (idle_anim_button_.pressed()) {
@ -747,7 +718,6 @@ void preferences_dialog::process_event()
idle_anim_slider_.set_value(0);
}
set_gamma(gamma_slider_.value());
set_idle_anim_rate(idle_anim_slider_.value());
return;
@ -1061,11 +1031,6 @@ void preferences_dialog::set_selection(int index)
autosavemax_slider_.enable(!hide_general);
const bool hide_display = tab_ != DISPLAY_TAB;
gamma_label_.hide(hide_display);
gamma_slider_.hide(hide_display);
gamma_label_.enable(adjust_gamma());
gamma_slider_.enable(adjust_gamma());
gamma_button_.hide(hide_display);
show_floating_labels_button_.hide(hide_display);
show_colour_cursors_button_.hide(hide_display);
show_haloing_button_.hide(hide_display);

33
src/preferences.cpp
View file

@ -235,39 +235,6 @@ void set_language(const std::string& s)
preferences::set("locale", s);
}
/**
* @todo the gamma correction seems to cause quite some bugs and the feature
* seems a bit useless so disable the code to evaluate the usefulness.
*/
bool adjust_gamma()
{
return false;
// return utils::string_bool(get("adjust_gamma"), false);
}
void _set_adjust_gamma(bool val)
{
preferences::set("adjust_gamma", val ? "yes" : "no");
}
int gamma()
{
static const int default_value = 100;
return default_value;
/*
if(!adjust_gamma()) {
return default_value;
}
return lexical_cast_default<int>(get("gamma"), default_value);
*/
}
void _set_gamma(int gamma)
{
preferences::set("gamma", lexical_cast<std::string>(gamma));
}
bool grid()
{
return utils::string_bool(get("grid"), false);

6
src/preferences.hpp
View file

@ -77,12 +77,6 @@ namespace preferences {
const std::string& language();
void set_language(const std::string& s);
bool adjust_gamma();
void _set_adjust_gamma(bool val);
int gamma();
void _set_gamma(int gamma);
// Don't rename it to sound() because of a gcc-3.3 branch bug,
// which will cause it to conflict with the sound namespace.
bool sound_on();

24
src/preferences_display.cpp
View file

@ -14,7 +14,7 @@
/**
* @file preferences_display.cpp
* Manage display-related preferences, e.g. screen-size, gamma etc.
* Manage display-related preferences, e.g. screen-size, etc.
*/
#include "global.hpp"
@ -46,7 +46,6 @@ display_manager::display_manager(display* d)
set_turbo_speed(turbo_speed());
set_fullscreen(fullscreen());
set_scroll_to_action(scroll_to_action());
set_gamma(gamma());
set_colour_cursors(utils::string_bool(preferences::get("colour_cursors")));
}
@ -139,27 +138,6 @@ void set_turbo_speed(double speed)
}
}
void set_adjust_gamma(bool val)
{
// If we are turning gamma adjustment off, then set it to '1.0'
if(val == false && adjust_gamma()) {
CVideo& video = disp->video();
video.setGamma(1.0);
}
_set_adjust_gamma(val);
}
void set_gamma(int gamma)
{
_set_gamma(gamma);
if(adjust_gamma()) {
CVideo& video = disp->video();
video.setGamma(static_cast<float>(gamma) / 100);
}
}
void set_grid(bool ison)
{
_set_grid(ison);

2
src/preferences_display.hpp
View file

@ -32,8 +32,6 @@ namespace preferences {
void set_resolution(const std::pair<int,int>& res);
void set_turbo(bool ison);
void set_grid(bool ison);
void set_gamma(int gamma);
void set_adjust_gamma(bool val);
void set_turbo_speed(double speed);
void set_colour_cursors(bool value);

7
src/video.cpp
View file

@ -336,13 +336,6 @@ bool CVideo::modeChanged()
return ret;
}
int CVideo::setGamma(float gamma)
{
SDL_SetGamma(gamma, gamma, gamma);
return 0;
}
int CVideo::getx() const
{
return frameBuffer->w;

2
src/video.hpp
View file

@ -54,8 +54,6 @@ class CVideo : private boost::noncopyable {
//did the mode change, since the last call to the modeChanged() method?
bool modeChanged();
int setGamma(float gamma);
//functions to get the dimensions of the current video-mode
int getx() const;
int gety() const;