projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SDL: Remove the alpha channel and approximate with a colorkey if the texture doesn...
[supertux.git]
/
src
/
gameconfig.cpp
diff --git
a/src/gameconfig.cpp
b/src/gameconfig.cpp
index
eedc884
..
060eed0
100644
(file)
--- a/
src/gameconfig.cpp
+++ b/
src/gameconfig.cpp
@@
-36,6
+36,8
@@
Config* config = 0;
Config::Config()
{
use_fullscreen = true;
Config::Config()
{
use_fullscreen = true;
+ video = AUTO_VIDEO;
+ try_vsync = true;
show_fps = false;
sound_enabled = true;
music_enabled = true;
show_fps = false;
sound_enabled = true;
music_enabled = true;
@@
-47,6
+49,8
@@
Config::Config()
aspect_ratio = -1; // autodetect
enable_script_debugger = false;
aspect_ratio = -1; // autodetect
enable_script_debugger = false;
+
+ locale = ""; // autodetect
}
Config::~Config()
}
Config::~Config()
@@
-64,11
+68,16
@@
Config::load()
config_lisp->get("show_fps", show_fps);
config_lisp->get("console", console_enabled);
config_lisp->get("show_fps", show_fps);
config_lisp->get("console", console_enabled);
+ config_lisp->get("locale", locale);
config_lisp->get("random_seed", random_seed);
const lisp::Lisp* config_video_lisp = config_lisp->get_lisp("video");
if(config_video_lisp) {
config_video_lisp->get("fullscreen", use_fullscreen);
config_lisp->get("random_seed", random_seed);
const lisp::Lisp* config_video_lisp = config_lisp->get_lisp("video");
if(config_video_lisp) {
config_video_lisp->get("fullscreen", use_fullscreen);
+ std::string video_string;
+ config_video_lisp->get("video", video_string);
+ video = get_video_system(video_string);
+ config_video_lisp->get("vsync", try_vsync);
config_video_lisp->get("width", screenwidth);
config_video_lisp->get("height", screenheight);
config_video_lisp->get("aspect_ratio", aspect_ratio);
config_video_lisp->get("width", screenwidth);
config_video_lisp->get("height", screenheight);
config_video_lisp->get("aspect_ratio", aspect_ratio);
@@
-95,9
+104,12
@@
Config::save()
writer.write_bool("show_fps", show_fps);
writer.write_bool("console", console_enabled);
writer.write_bool("show_fps", show_fps);
writer.write_bool("console", console_enabled);
+ writer.write_string("locale", locale);
writer.start_list("video");
writer.write_bool("fullscreen", use_fullscreen);
writer.start_list("video");
writer.write_bool("fullscreen", use_fullscreen);
+ writer.write_string("video", get_video_string(video));
+ writer.write_bool("vsync", try_vsync);
writer.write_int("width", screenwidth);
writer.write_int("height", screenheight);
writer.write_float("aspect_ratio", aspect_ratio);
writer.write_int("width", screenwidth);
writer.write_int("height", screenheight);
writer.write_float("aspect_ratio", aspect_ratio);