summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-21 02:01:24 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-21 02:01:24 +0300
commitd2e83863e6e5faa6d6eeb3ab0c0a384dac3a0a11 (patch)
tree154752870ab1ba3118bd981a492c2ca3d049655e /src
parent08331e4e8e06912c278f6c1536db9a922d9d32e0 (diff)
downloadplus-d2e83863e6e5faa6d6eeb3ab0c0a384dac3a0a11.tar.gz
plus-d2e83863e6e5faa6d6eeb3ab0c0a384dac3a0a11.tar.bz2
plus-d2e83863e6e5faa6d6eeb3ab0c0a384dac3a0a11.tar.xz
plus-d2e83863e6e5faa6d6eeb3ab0c0a384dac3a0a11.zip
Fix some issues after automatic code checking.
Diffstat (limited to 'src')
-rw-r--r--src/gui/viewport.cpp2
-rw-r--r--src/gui/widgets/layout.h2
-rw-r--r--src/net/ea/beinghandler.cpp11
-rw-r--r--src/net/ea/buysellhandler.cpp5
4 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index e399d96ce..1053fa1c9 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -318,7 +318,7 @@ void Viewport::_drawDebugPath(Graphics *graphics)
// Draw the path debug information for every beings.
ActorSpritesConstIterator it, it_end;
const ActorSprites &actors = actorSpriteManager->getAll();
- for (it = actors.begin(), it_end = actors.end() ; it != it_end; it++)
+ for (it = actors.begin(), it_end = actors.end() ; it != it_end; ++ it)
{
Being *being = dynamic_cast<Being*>(*it);
if (being && being != player_node)
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 2621f018a..f5e1f1749 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -183,6 +183,8 @@ class LayoutCell
mAlign[1] = 0;
mNbFill[0] = 0;
mNbFill[1] = 0;
+ mSize[0] = 0;
+ mSize[1] = 0;
}
~LayoutCell();
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 91c83a4e9..f59283e23 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -121,10 +121,8 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible)
Uint16 weapon, shield;
Uint16 stunMode;
Uint32 statusEffects;
- int guild;
Being *dstBeing;
int hairStyle, hairColor;
- int hp, maxHP, oldHP;
int spawnId;
// Information about a being in range
@@ -214,22 +212,21 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible)
if (dstBeing->getType() == ActorSprite::MONSTER)
{
- hp = msg.readInt32();
- maxHP = msg.readInt32();
+ int hp = msg.readInt32();
+ int maxHP = msg.readInt32();
if (hp && maxHP)
{
- oldHP = dstBeing->getHP();
+ int oldHP = dstBeing->getHP();
if (!oldHP || oldHP > hp)
dstBeing->setHP(hp);
dstBeing->setMaxHP(maxHP);
}
gloves = 0;
- guild = 0;
}
else
{
gloves = msg.readInt16(); // head dir - "abused" as gloves
- guild = msg.readInt32(); // guild
+ msg.readInt32(); // guild
msg.readInt16(); // guild emblem
}
// logger->log("being guild: " + toString(guild));
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 35180c10f..2ee586c92 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -47,9 +47,10 @@
namespace Ea
{
-BuySellHandler::BuySellHandler()
+BuySellHandler::BuySellHandler() :
+ mNpcId(0),
+ mBuyDialog(0)
{
- mNpcId = 0;
}
void BuySellHandler::requestSellList(std::string nick)