projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
you can compare colors now
[supertux.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
17bd431
..
38180b5
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-278,7
+278,8
@@
static bool parse_commandline(int argc, char** argv)
print_usage(argv[0]);
throw std::runtime_error("Need to specify a parameter for aspect switch");
}
print_usage(argv[0]);
throw std::runtime_error("Need to specify a parameter for aspect switch");
}
- if(strcasecmp(argv[i], "auto") == 0) {
+ if(strcasecmp(argv[i+1], "auto") == 0) {
+ i++;
config->aspect_ratio = -1;
} else {
int aspect_width, aspect_height;
config->aspect_ratio = -1;
} else {
int aspect_width, aspect_height;
@@
-371,8
+372,10
@@
void init_video()
desktop_height = info->current_h;
}
desktop_height = info->current_h;
}
- /* we want vsync for smooth scrolling */
- SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
+ if(config->try_vsync) {
+ /* we want vsync for smooth scrolling */
+ SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
+ }
#endif
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
#endif
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
@@
-410,11
+413,13
@@
void init_video()
}
#endif
}
#endif
+ SDL_ShowCursor(0);
+
double aspect_ratio = config->aspect_ratio;
// try to guess aspect ratio of monitor if needed
if (aspect_ratio <= 0) {
double aspect_ratio = config->aspect_ratio;
// try to guess aspect ratio of monitor if needed
if (aspect_ratio <= 0) {
- if(desktop_width > 0) {
+ if(
config->use_fullscreen &&
desktop_width > 0) {
aspect_ratio = static_cast<double>(desktop_width) / static_cast<double>(desktop_height);
} else {
aspect_ratio = 4.0 / 3.0;
aspect_ratio = static_cast<double>(desktop_width) / static_cast<double>(desktop_height);
} else {
aspect_ratio = 4.0 / 3.0;