summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-04-04 01:57:02 +0300
committerAndrei Karas <akaras@inbox.ru>2011-04-04 01:57:02 +0300
commit07e988baf55b0e0f4b736e9305604536dbc872ff (patch)
tree9f95e6b76165d2d86e0c0bda9407a8bd18996c7c
parent9d6b0b3a63f859c6cbb74582221b134d5614acf8 (diff)
downloadmanaplus-07e988baf55b0e0f4b736e9305604536dbc872ff.tar.gz
manaplus-07e988baf55b0e0f4b736e9305604536dbc872ff.tar.bz2
manaplus-07e988baf55b0e0f4b736e9305604536dbc872ff.tar.xz
manaplus-07e988baf55b0e0f4b736e9305604536dbc872ff.zip
Add initialisation for some variables, fix compilation warning.
-rw-r--r--src/being.h2
-rw-r--r--src/gui/popupmenu.cpp5
-rw-r--r--src/gui/popupmenu.h2
3 files changed, 8 insertions, 1 deletions
diff --git a/src/being.h b/src/being.h
index 1faec9560..f55b05f5f 100644
--- a/src/being.h
+++ b/src/being.h
@@ -89,7 +89,7 @@ class Being : public ActorSprite, public ConfigListener
SIT,
DEAD,
HURT,
- SPAWN,
+ SPAWN
};
enum Speech
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 7493c3745..0ab0ac4a3 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -1471,6 +1471,11 @@ void PopupMenu::showPopup(int x, int y)
requestMoveToTop();
}
+RenameListener::RenameListener() :
+ mMapItem(0),
+ mDialog(0)
+{
+}
void RenameListener::action(const gcn::ActionEvent &event)
{
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 5250fa093..6dca1ff64 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -50,6 +50,8 @@ class Window;
class RenameListener : public gcn::ActionListener
{
public:
+ RenameListener();
+
void action(const gcn::ActionEvent &event);
void setMapItem(MapItem* mapItem)