diff options
| -rw-r--r-- | src/gui/connection.cpp | 2 | ||||
| -rw-r--r-- | src/gui/skilldialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/statuswindow.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwserv/inventoryhandler.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp index 6428fb7c..0862ee69 100644 --- a/src/gui/connection.cpp +++ b/src/gui/connection.cpp @@ -36,7 +36,7 @@ ConnectionDialog::ConnectionDialog(int previousState): setContentSize(200, 100); Button *cancelButton = new Button(_("Cancel"), "cancelButton", this); - mProgressBar = new ProgressBar(0.0, 200 - 10, 20, 128, 128, 128); + mProgressBar = new ProgressBar(0.0, 200 - 10, 20, gcn::Color(128, 128, 128)); gcn::Label *label = new Label(_("Connecting...")); cancelButton->setPosition(5, 100 - 5 - cancelButton->getHeight()); diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 48931bf7..f0cd01ce 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -184,7 +184,7 @@ SkillTab::SkillTab(const std::string &type): type(type) mSkillNameLabels.at(a)->setPosition(35, a*32 ); add(mSkillNameLabels.at(a)); - mSkillProgress.at(a) = new ProgressBar(0.0f, 200, 20, 150, 150, 150); + mSkillProgress.at(a) = new ProgressBar(0.0f, 200, 20, gcn::Color(150, 150, 150)); mSkillProgress.at(a)->setPosition(35, a*32 + 13); add(mSkillProgress.at(a)); diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index b4e6e770..e76c19a7 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -50,7 +50,7 @@ StatusWindow::StatusWindow(LocalPlayer *player): mMoneyLabel = new Label("Money:"); mHpLabel = new Label("HP:"); - mHpBar = new ProgressBar(1.0f, 80, 15, 0, 171, 34); + mHpBar = new ProgressBar(1.0f, 80, 15, gcn::Color(0, 171, 34)); mHpValueLabel = new Label; int y = 3; diff --git a/src/net/tmwserv/inventoryhandler.cpp b/src/net/tmwserv/inventoryhandler.cpp index 75886948..d78c8318 100644 --- a/src/net/tmwserv/inventoryhandler.cpp +++ b/src/net/tmwserv/inventoryhandler.cpp @@ -137,8 +137,8 @@ void InventoryHandler::moveItem(int oldIndex, int newIndex) if (oldIndex == newIndex) return; - // TODO fix me! - Net::GameServer::Player::moveItem(oldIndex, newIndex, -1); + Net::GameServer::Player::moveItem(oldIndex, newIndex, + player_node->getInventory()->getItem(oldIndex)->getQuantity()); } void InventoryHandler::openStorage() |