summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
Diffstat (limited to 'src/being')
-rw-r--r--src/being/actorsprite.cpp2
-rw-r--r--src/being/actorsprite.h2
-rw-r--r--src/being/being.cpp2
-rw-r--r--src/being/localplayer.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index b5eed97d0..56b21288d 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -160,7 +160,7 @@ void ActorSprite::controlCustomParticle(Particle *const particle)
}
}
-void ActorSprite::controlParticleDeleted(Particle *const particle)
+void ActorSprite::controlParticleDeleted(const Particle *const particle)
{
if (particle)
mChildParticleEffects.removeLocally(particle);
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index 5373b30dc..5f5bcbe5d 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -195,7 +195,7 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
mChildParticleEffects.size();
}
- void controlParticleDeleted(Particle *const particle);
+ void controlParticleDeleted(const Particle *const particle);
protected:
/**
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 2737f2b8a..3f58bbde6 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -2625,7 +2625,7 @@ void Being::setSpriteId(const unsigned int slot,
BeingSlot &beingSlot = mSlots[slot];
beingSlot.spriteId = id;
- beingSlot.color = "";
+ beingSlot.color.clear();
beingSlot.colorId = ItemColor_one;
beingSlot.cardsId = CardsList(nullptr);
recalcSpritesOrder();
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 236b9cb4b..54865a6ae 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -1234,7 +1234,7 @@ void LocalPlayer::moveToTarget(int dist)
bool gotPos(false);
Path debugPath;
- unsigned int limit(0);
+ size_t limit(0);
if (dist == -1)
{
@@ -1299,7 +1299,7 @@ void LocalPlayer::moveToTarget(int dist)
else
{
Position pos(0, 0);
- unsigned int f = 0;
+ size_t f = 0;
for (Path::const_iterator i = debugPath.begin(),
i_fend = debugPath.end();