diff options
| author | Matthew Hoops | 2011-07-20 09:27:39 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-07-20 09:27:39 -0400 |
| commit | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (patch) | |
| tree | e568d96f6d7f64c5e58b4c7cd1c4fda7e649bfc7 /backends/graphics/opengl/opengl-graphics.h | |
| parent | d7411acc2b1c7702280dbff1c3e1bafee528184b (diff) | |
| parent | e25e85fbb047fef895ede97c3c2c73451631052c (diff) | |
| download | scummvm-rg350-ad293b249e74dd1cfbdbd721d02145efbdaf9eca.tar.gz scummvm-rg350-ad293b249e74dd1cfbdbd721d02145efbdaf9eca.tar.bz2 scummvm-rg350-ad293b249e74dd1cfbdbd721d02145efbdaf9eca.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'backends/graphics/opengl/opengl-graphics.h')
| -rw-r--r-- | backends/graphics/opengl/opengl-graphics.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h index 463715aad8..56f7d92a12 100644 --- a/backends/graphics/opengl/opengl-graphics.h +++ b/backends/graphics/opengl/opengl-graphics.h @@ -185,7 +185,7 @@ protected: /** * Set the scale factor. - * + * * This can only be used in a GFX transaction. * * @param newScale New scale factor. @@ -332,7 +332,7 @@ protected: GLTexture *_osdTexture; Graphics::Surface _osdSurface; uint8 _osdAlpha; - uint32 _osdFadeStartTime; + uint32 _osdFadeStartTime; bool _requireOSDUpdate; enum { kOSDFadeOutDelay = 2 * 1000, |