summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-05-12 03:02:22 +0300
committerAndrei Karas <akaras@inbox.ru>2012-05-12 03:02:22 +0300
commitf2cf27f0d25a75109fc278afd9925165191df51a (patch)
tree30e5591dd42f230beefd4d213ed642615f4bf919 /src
parent70b12c969e34bc5e1530bc7de05fdf3e7ecd6a81 (diff)
downloadplus-f2cf27f0d25a75109fc278afd9925165191df51a.tar.gz
plus-f2cf27f0d25a75109fc278afd9925165191df51a.tar.bz2
plus-f2cf27f0d25a75109fc278afd9925165191df51a.tar.xz
plus-f2cf27f0d25a75109fc278afd9925165191df51a.zip
Fix code style.
Diffstat (limited to 'src')
-rw-r--r--src/actorspritemanager.cpp7
-rw-r--r--src/openglgraphics.cpp5
2 files changed, 5 insertions, 7 deletions
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 2dd015df5..870d1a59d 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -40,8 +40,6 @@
#include "utils/gettext.h"
#include "utils/stringutils.h"
-#include "resources/iteminfo.h"
-
#include "net/net.h"
#include "net/playerhandler.h"
@@ -1620,8 +1618,11 @@ bool ActorSpriteManager::checkForPickup(FloorItem *item)
{
if (mPickupItemsSet.find("") != mPickupItemsSet.end())
{
- if (mIgnorePickupItemsSet.find(item->getName()) == mIgnorePickupItemsSet.end())
+ if (mIgnorePickupItemsSet.find(item->getName())
+ == mIgnorePickupItemsSet.end())
+ {
return true;
+ }
}
else if (mPickupItemsSet.find(item->getName()) != mPickupItemsSet.end())
{
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index b979cb473..4f800bf9b 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -1160,9 +1160,6 @@ void OpenGLGraphics::drawPoint(int x, int y)
void OpenGLGraphics::drawLine(int x1, int y1, int x2, int y2)
{
- unsigned int vp = 4;
- const unsigned int vLimit = vertexBufSize * 4;
-
setTexturingAndBlending(false);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -1171,7 +1168,7 @@ void OpenGLGraphics::drawLine(int x1, int y1, int x2, int y2)
mFloatTexArray[2] = static_cast<float>(x2) + 0.5f;
mFloatTexArray[3] = static_cast<float>(y2) + 0.5f;
- drawLineArrayf(vp);
+ drawLineArrayf(4);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
}