diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-08-30 02:19:37 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-08-30 02:19:37 +0300 |
| commit | 54b82fbfa89accf8e73d116e5d8fa9e348a4cab7 (patch) | |
| tree | 765692f1f7785fb4d2d21d4d966487f2235a193f | |
| parent | 46f0755975033f37eaae9db73c0e2b6499c2a923 (diff) | |
| download | manaplus-54b82fbfa89accf8e73d116e5d8fa9e348a4cab7.tar.gz manaplus-54b82fbfa89accf8e73d116e5d8fa9e348a4cab7.tar.bz2 manaplus-54b82fbfa89accf8e73d116e5d8fa9e348a4cab7.tar.xz manaplus-54b82fbfa89accf8e73d116e5d8fa9e348a4cab7.zip | |
Fix code style.
| -rw-r--r-- | src/guichan/gui.cpp | 2 | ||||
| -rw-r--r-- | src/normalopenglgraphics.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/guichan/gui.cpp b/src/guichan/gui.cpp index fda5cc1e7..41ff39797 100644 --- a/src/guichan/gui.cpp +++ b/src/guichan/gui.cpp @@ -191,7 +191,7 @@ namespace gcn throw GCN_EXCEPTION("Unknown mouse input type."); break; } - } + } } void Gui::handleKeyInput() diff --git a/src/normalopenglgraphics.cpp b/src/normalopenglgraphics.cpp index 5e0fc8a5c..b8b3eb89d 100644 --- a/src/normalopenglgraphics.cpp +++ b/src/normalopenglgraphics.cpp @@ -220,8 +220,8 @@ bool NormalOpenGLGraphics::drawImage2(const Image *const image, srcY += image->mBounds.y; if (!useColor) - glColor4ub(255, 255, 255, image->mAlpha * 255); -// glColor4f(1.0f, 1.0f, 1.0f, image->mAlpha); + glColor4f(1.0f, 1.0f, 1.0f, image->mAlpha); +// glColor4ub(255, 255, 255, image->mAlpha * 255); #ifdef DEBUG_BIND_TEXTURE debugBindTexture(image); |