diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/actorspritemanager.cpp | 7 | ||||
| -rw-r--r-- | src/openglgraphics.cpp | 5 |
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); } |