diff options
| author | Johannes Schickel | 2013-01-26 05:25:14 -0800 |
|---|---|---|
| committer | Johannes Schickel | 2013-01-26 05:25:14 -0800 |
| commit | 59dde5451908de79a89ee29937f3878cf221cc93 (patch) | |
| tree | af40548096459f766726938a0db278224f48705a /backends/graphics/opengl | |
| parent | 94edb3409fa949a6391c54adb4bf7fc4a1d210ad (diff) | |
| parent | 4d3ecbfcd2aabf0885df978e6e44ef8b8256c657 (diff) | |
| download | scummvm-rg350-59dde5451908de79a89ee29937f3878cf221cc93.tar.gz scummvm-rg350-59dde5451908de79a89ee29937f3878cf221cc93.tar.bz2 scummvm-rg350-59dde5451908de79a89ee29937f3878cf221cc93.zip | |
Merge pull request #301 from lordhoto/c++11-playground
RFC: Allow use of override and nullptr. Also allow C++11 compilation.
Diffstat (limited to 'backends/graphics/opengl')
| -rw-r--r-- | backends/graphics/opengl/gltexture.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/graphics/opengl/gltexture.cpp b/backends/graphics/opengl/gltexture.cpp index 351c8f9b00..ca674563df 100644 --- a/backends/graphics/opengl/gltexture.cpp +++ b/backends/graphics/opengl/gltexture.cpp @@ -211,10 +211,10 @@ void GLTexture::drawTexture(GLshort x, GLshort y, GLshort w, GLshort h) { // Calculate the screen rect where the texture will be drawn const GLshort vertices[] = { - x, y, - x + w, y, - x, y + h, - x + w, y + h, + x, y, + (GLshort)(x + w), y, + x, (GLshort)(y + h), + (GLshort)(x + w), (GLshort)(y + h), }; glVertexPointer(2, GL_SHORT, 0, vertices); CHECK_GL_ERROR(); |