summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-05 01:36:41 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-05 01:51:06 +0300
commit4c3cfc12b580268b549d68213f54e9e8c64dd4d1 (patch)
tree1edcf58c17df2e82aa9c3fa1757640a96fd4b926 /src
parentfb198a2e9c3e06f9cff759b25fd57fa3f3051ccf (diff)
downloadmv-4c3cfc12b580268b549d68213f54e9e8c64dd4d1.tar.gz
mv-4c3cfc12b580268b549d68213f54e9e8c64dd4d1.tar.bz2
mv-4c3cfc12b580268b549d68213f54e9e8c64dd4d1.tar.xz
mv-4c3cfc12b580268b549d68213f54e9e8c64dd4d1.zip
Fix complilation warnings.
Diffstat (limited to 'src')
-rw-r--r--src/gui/inventorywindow.cpp8
-rw-r--r--src/gui/widgets/inventoryfilter.cpp6
-rw-r--r--src/gui/widgets/inventoryfilter.h4
-rw-r--r--src/net/tmwa/beinghandler.cpp6
4 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index a41334d06..a12f4cf61 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -114,11 +114,11 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
std::vector<std::string> tags = ItemDB::getTags();
for (unsigned f = 0; f < tags.size(); f ++)
- mFilter->add(tags[f]);
+ mFilter->addButton(tags[f]);
- mSorter->add(_("na"), "na");
- mSorter->add(_("az"), "az");
- mSorter->add(_("id"), "id");
+ mSorter->addButton(_("na"), "na");
+ mSorter->addButton(_("az"), "az");
+ mSorter->addButton(_("id"), "id");
if (isMainInventory())
{
diff --git a/src/gui/widgets/inventoryfilter.cpp b/src/gui/widgets/inventoryfilter.cpp
index 7de7457ea..8c62849a1 100644
--- a/src/gui/widgets/inventoryfilter.cpp
+++ b/src/gui/widgets/inventoryfilter.cpp
@@ -31,12 +31,12 @@ InventoryFilter::InventoryFilter(std::string group, int height, int spacing):
{
}
-void InventoryFilter::add(std::string tag)
+void InventoryFilter::addButton(std::string tag)
{
- add(tag, tag);
+ addButton(tag, tag);
}
-void InventoryFilter::add(std::string text, std::string tag)
+void InventoryFilter::addButton(std::string text, std::string tag)
{
if (text.empty() || tag.empty())
return;
diff --git a/src/gui/widgets/inventoryfilter.h b/src/gui/widgets/inventoryfilter.h
index aa71bb419..ed49ba39b 100644
--- a/src/gui/widgets/inventoryfilter.h
+++ b/src/gui/widgets/inventoryfilter.h
@@ -38,9 +38,9 @@ class InventoryFilter : public HorizontContainer, public gcn::ActionListener
public:
InventoryFilter(std::string group, int height, int spacing);
- void add(std::string tag);
+ void addButton(std::string tag);
- void add(std::string text, std::string tag);
+ void addButton(std::string text, std::string tag);
void action(const gcn::ActionEvent &event);
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 402a3e7eb..582f755f1 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -477,8 +477,8 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
srcBeing = actorSpriteManager->findBeing(msg.readInt32());
dstBeing = actorSpriteManager->findBeing(msg.readInt32());
msg.readInt32(); // Server tick
- int srcSpeed = msg.readInt32(); // src speed
- int dstSpeed = msg.readInt32(); // dst speed
+ msg.readInt32(); // src speed
+ msg.readInt32(); // dst speed
param1 = msg.readInt32(); // Damage
msg.readInt16(); // Skill level
msg.readInt16(); // Div
@@ -505,7 +505,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
msg.readInt32(); // server tick
int srcSpeed = msg.readInt32(); // src speed
- int dstSpeed = msg.readInt32(); // dst speed
+ msg.readInt32(); // dst speed
param1 = msg.readInt16();
msg.readInt16(); // param 2
type = msg.readInt8();