projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
snv ignore version.h, add includes for gcc 4.3.3.
[supertux.git]
/
src
/
video
/
gl_renderer.cpp
diff --git
a/src/video/gl_renderer.cpp
b/src/video/gl_renderer.cpp
index
acb1174
..
1d062c4
100644
(file)
--- a/
src/video/gl_renderer.cpp
+++ b/
src/video/gl_renderer.cpp
@@
-151,8
+151,7
@@
Renderer::Renderer()
if(texture_manager != 0)
texture_manager->save_textures();
if(texture_manager != 0)
texture_manager->save_textures();
-#ifndef GP2X
- //FIXME: This is not supported on the GP2X
+#ifdef SDL_GL_SWAP_CONTROL
if(config->try_vsync) {
/* 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);
@@
-264,7
+263,7
@@
Renderer::draw_surface_part(const DrawingRequest& request)
uv_bottom,
0.0,
request.alpha,
uv_bottom,
0.0,
request.alpha,
-
Color(1.0, 1.0, 1.0)
,
+
request.color
,
Blend(),
request.drawing_effect);
}
Blend(),
request.drawing_effect);
}