diff options
| -rw-r--r-- | src/compoundsprite.cpp | 4 | ||||
| -rw-r--r-- | src/net/manaserv/adminhandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/manaserv/adminhandler.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp index 99fae4f88..c6921b2e8 100644 --- a/src/compoundsprite.cpp +++ b/src/compoundsprite.cpp @@ -410,7 +410,11 @@ void CompoundSprite::setAlpha(float alpha) { if (alpha != mAlpha) { +#ifdef USE_OPENGL if (mEnableAlphaFix && Image::mUseOpenGL == 0 && size() > 3) +#else + if (mEnableAlphaFix && size() > 3) +#endif { SpriteConstIterator it, it_end; for (it = begin(), it_end = end(); it != it_end; ++ it) diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp index 2c76e99a3..a8860d73b 100644 --- a/src/net/manaserv/adminhandler.cpp +++ b/src/net/manaserv/adminhandler.cpp @@ -91,7 +91,8 @@ void AdminHandler::mute(int playerId A_UNUSED, int type A_UNUSED, // TODO } -void AdminHandler::warp(std::string map, int x, int y) +void AdminHandler::warp(std::string map A_UNUSED, + int x A_UNUSED, int y A_UNUSED) { // TODO } diff --git a/src/net/manaserv/adminhandler.h b/src/net/manaserv/adminhandler.h index 65e9ea2b0..17d296bd6 100644 --- a/src/net/manaserv/adminhandler.h +++ b/src/net/manaserv/adminhandler.h @@ -24,6 +24,7 @@ #define NET_MANASERV_ADMINHANDLER_H #include "net/adminhandler.h" +#include "string" #ifdef __GNUC__ #define A_UNUSED __attribute__ ((unused)) |