summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-09 22:10:53 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-09 22:11:30 +0300
commit703a3c4df3732e3e88559147001260f3355d42d6 (patch)
treefcaf8919cf734429374e4bb9a83b2b4a33835d1d /src/gui/widgets
parent3a875a0026936d4bcb3bd1c2b6e8ac547cd5e27e (diff)
downloadplus-703a3c4df3732e3e88559147001260f3355d42d6.tar.gz
plus-703a3c4df3732e3e88559147001260f3355d42d6.tar.bz2
plus-703a3c4df3732e3e88559147001260f3355d42d6.tar.xz
plus-703a3c4df3732e3e88559147001260f3355d42d6.zip
Continue fix for shadow variables/methods errors.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/avatarlistbox.cpp2
-rw-r--r--src/gui/widgets/mouseevent.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 29fca7662..18dc48417 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -330,7 +330,7 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
Being* being = actorSpriteManager->findBeingByName(ava->getName(),
Being::PLAYER);
if (being)
- actorSpriteManager->heal(player_node, being);
+ actorSpriteManager->heal(being);
}
else
{
diff --git a/src/gui/widgets/mouseevent.h b/src/gui/widgets/mouseevent.h
index 5e9a46cfd..9484be0a5 100644
--- a/src/gui/widgets/mouseevent.h
+++ b/src/gui/widgets/mouseevent.h
@@ -28,12 +28,12 @@
class MouseEvent : public gcn::MouseEvent
{
public:
- MouseEvent(gcn::Widget* source, bool isShiftPressed,
- bool isControlPressed, bool isAltPressed,
- bool isMetaPressed, unsigned int type, unsigned int button,
+ MouseEvent(gcn::Widget* source, bool shiftPressed,
+ bool controlPressed, bool altPressed,
+ bool metaPressed, unsigned int type, unsigned int button,
int x, int y, int clickCount) :
- gcn::MouseEvent(source, isShiftPressed, isControlPressed,
- isAltPressed, isMetaPressed, type, button, x, y,
+ gcn::MouseEvent(source, shiftPressed, controlPressed,
+ altPressed, metaPressed, type, button, x, y,
clickCount)
{
}