diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-06-21 21:29:51 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-06-21 21:29:51 +0300 |
commit | f3a89322713a379678abc420d75230a9b17aa18f (patch) | |
tree | 1fa4318ba77eeef61272eb6cd982c7bf37b82800 /src/nullopenglgraphics.cpp | |
parent | 552867509d2a29d806d2ba416b24fbf7ac711803 (diff) | |
download | manaverse-f3a89322713a379678abc420d75230a9b17aa18f.tar.gz manaverse-f3a89322713a379678abc420d75230a9b17aa18f.tar.bz2 manaverse-f3a89322713a379678abc420d75230a9b17aa18f.tar.xz manaverse-f3a89322713a379678abc420d75230a9b17aa18f.zip |
fix code style.
Diffstat (limited to 'src/nullopenglgraphics.cpp')
-rw-r--r-- | src/nullopenglgraphics.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nullopenglgraphics.cpp b/src/nullopenglgraphics.cpp index a74a89a0b..ff3295485 100644 --- a/src/nullopenglgraphics.cpp +++ b/src/nullopenglgraphics.cpp @@ -553,8 +553,7 @@ inline void NullOpenGLGraphics::drawVertexes(const for (iv = intVertPool.begin(), ft = floatTexPool.begin(), ivp = vp.begin(); - iv != iv_end, ft != ft_end, - ivp != ivp_end; + iv != iv_end && ft != ft_end && ivp != ivp_end; ++ iv, ++ ft, ++ ivp) { drawQuadArrayfi(*iv, *ft, *ivp); @@ -568,8 +567,7 @@ inline void NullOpenGLGraphics::drawVertexes(const for (iv = intVertPool.begin(), it = intTexPool.begin(), ivp = vp.begin(); - iv != iv_end, it != it_end, - ivp != ivp_end; + iv != iv_end && it != it_end && ivp != ivp_end; ++ iv, ++ it, ++ ivp) { drawQuadArrayii(*iv, *it, *ivp); @@ -989,8 +987,8 @@ void NullOpenGLGraphics::drawPoint(int x A_UNUSED, int y A_UNUSED) restoreColor(); } -void NullOpenGLGraphics::drawLine(int x1 A_UNUSED, int y1 A_UNUSED, - int x2 A_UNUSED, int y2 A_UNUSED) +void NullOpenGLGraphics::drawLine(int x1, int y1, + int x2, int y2) { setTexturingAndBlending(false); restoreColor(); |