diff options
| -rw-r--r-- | src/actorspritemanager.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 8 | ||||
| -rw-r--r-- | src/guichan/rectangle.cpp | 2 | ||||
| -rw-r--r-- | src/net/logindata.h | 2 | ||||
| -rw-r--r-- | src/net/manaserv/attributes.cpp | 2 | ||||
| -rw-r--r-- | src/utils/sha256.cpp | 2 |
6 files changed, 6 insertions, 11 deletions
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index 89bc30cde..bcb807131 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -27,7 +27,6 @@ #include "logger.h" #include "main.h" #include "playerinfo.h" -#include "playerrelations.h" #include "gui/chatwindow.h" #include "gui/equipmentwindow.h" diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 6b5263aa9..be04b99aa 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -106,8 +106,6 @@ void BrowserBox::addRow(const std::string &row, bool atTop) std::string tmp = row; std::string newRow; size_t idx1; - size_t idx2; - size_t idx3; gcn::Font *font = getFont(); if (getWidth() < 0) @@ -122,8 +120,8 @@ void BrowserBox::addRow(const std::string &row, bool atTop) idx1 = tmp.find("@@"); while (idx1 != std::string::npos) { - idx2 = tmp.find("|", idx1); - idx3 = tmp.find("@@", idx2); + size_t idx2 = tmp.find("|", idx1); + size_t idx3 = tmp.find("@@", idx2); if (idx2 == std::string::npos || idx3 == std::string::npos) break; @@ -677,7 +675,7 @@ std::string BrowserBox::getTextAtPos(const int x, const int y) if (x < textX || y < textY) return ""; // mouse position ourside of correct widget (outside of tab) - textX = x - textX; +// textX = x - textX; textY = y - textY; std::string str = ""; diff --git a/src/guichan/rectangle.cpp b/src/guichan/rectangle.cpp index 76965e430..0a6ed2908 100644 --- a/src/guichan/rectangle.cpp +++ b/src/guichan/rectangle.cpp @@ -99,7 +99,7 @@ namespace gcn if (y_ < 0) { height_ += y_; - y_ = 0; +// y_ = 0; } else if (y_ + height_ > rectangle.height) { diff --git a/src/net/logindata.h b/src/net/logindata.h index bf0ac40b1..a8b76fa25 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -25,8 +25,6 @@ #include "being.h" -#include "net/serverinfo.h" - #include <string> class LoginData diff --git a/src/net/manaserv/attributes.cpp b/src/net/manaserv/attributes.cpp index eb0f72dc5..47eb5b253 100644 --- a/src/net/manaserv/attributes.cpp +++ b/src/net/manaserv/attributes.cpp @@ -352,7 +352,7 @@ namespace Attributes } logger->log("Found %d tags for %d attributes.", static_cast<int>(tags.size()), - static_casr<int>(attributes.size())); + static_cast<int>(attributes.size())); fillLabels(); diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp index d28fa43fb..a56f6ec9a 100644 --- a/src/utils/sha256.cpp +++ b/src/utils/sha256.cpp @@ -280,7 +280,7 @@ std::string SHA256Hash(const char *src, int len) SHA256Context ctx; SHA256Init(&ctx); SHA256Update(&ctx, static_cast<unsigned char *>(src), - static_casr<unsigned int>(len)); + static_cast<unsigned int>(len)); SHA256Final(&ctx, bytehash); // Convert it to hex const char* hxc = "0123456789abcdef"; |