summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/being/being.cpp6
-rw-r--r--src/gui/gui.cpp1
-rw-r--r--src/gui/widgets/textfield.cpp16
-rw-r--r--src/gui/windows/chatwindow.cpp1
-rw-r--r--src/particle/particleinfo.h7
5 files changed, 19 insertions, 12 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 7e690edf5..65bcc5782 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -124,6 +124,7 @@ Being::Being(const int id, const Type type, const uint16_t subtype,
mSpriteColors(),
mSpriteIDs(),
mSpriteColorsIds(),
+ mSpriteParticles(),
mGuilds(),
mParty(nullptr),
mActionTime(0),
@@ -3169,8 +3170,11 @@ void Being::recreateItemParticles()
ParticleInfo *const pi = (*it).second;
if (pi && !pi->files.empty())
{
- FOR_EACH (std::vector<Particle*>::const_iterator, itp, pi->particles)
+ FOR_EACH (std::vector<Particle*>::const_iterator,
+ itp, pi->particles)
+ {
mChildParticleEffects.removeLocally(*itp);
+ }
FOR_EACH (std::vector<std::string>::const_iterator, str, pi->files)
{
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 4284c1af8..60924bfd4 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -37,7 +37,6 @@
#include "client.h"
#include "configuration.h"
#include "dragdrop.h"
-#include "mouseinput.h"
#include "touchmanager.h"
#include "input/keydata.h"
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 49aad86b6..7a6f27ee2 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -23,7 +23,6 @@
#include "gui/widgets/textfield.h"
#include "client.h"
-#include "mouseinput.h"
#if defined ANDROID || defined USE_SDL2
#include "input/inputmanager.h"
@@ -32,7 +31,6 @@
#include "input/keydata.h"
#include "input/keyevent.h"
-#include "gui/sdlinput.h"
#include "gui/viewport.h"
#include "gui/popups/popupmenu.h"
@@ -539,13 +537,13 @@ void TextField::moveCaretForward()
void TextField::caretDelete()
{
- unsigned sz = static_cast<unsigned>(mText.size());
- while (mCaretPosition < sz)
- {
- --sz;
- mText.erase(mCaretPosition, 1);
- if (mCaretPosition == sz || (mText[mCaretPosition] & 192) != 128)
- break;
+ unsigned sz = static_cast<unsigned>(mText.size());
+ while (mCaretPosition < sz)
+ {
+ --sz;
+ mText.erase(mCaretPosition, 1);
+ if (mCaretPosition == sz || (mText[mCaretPosition] & 192) != 128)
+ break;
}
}
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 35c8659b4..576ff9fd4 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -28,7 +28,6 @@
#include "configuration.h"
#include "game.h"
#include "guild.h"
-#include "mouseinput.h"
#include "party.h"
#include "spellshortcut.h"
diff --git a/src/particle/particleinfo.h b/src/particle/particleinfo.h
index 70c4fb19f..a0bdb8397 100644
--- a/src/particle/particleinfo.h
+++ b/src/particle/particleinfo.h
@@ -24,9 +24,16 @@
#include "particle/particle.h"
#include <string>
+#include <vector>
struct ParticleInfo
{
+ ParticleInfo() :
+ files(),
+ particles()
+ {
+ }
+
std::vector<std::string> files;
std::vector<Particle*> particles;
};