summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-12-24 14:45:34 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-12-24 14:45:34 +0000
commit1514e0276230fe96f8f13d6d2ce7f15afdf717ce (patch)
tree0bdac199e329e1acd7f200f3a2cbfbfadfd7257d
parent1b19e8e0ad81cf2726fa27133aa342bbb91540dd (diff)
downloadmana-1514e0276230fe96f8f13d6d2ce7f15afdf717ce.tar.gz
mana-1514e0276230fe96f8f13d6d2ce7f15afdf717ce.tar.bz2
mana-1514e0276230fe96f8f13d6d2ce7f15afdf717ce.tar.xz
mana-1514e0276230fe96f8f13d6d2ce7f15afdf717ce.zip
Fixed compile warning.
-rw-r--r--ChangeLog1
-rw-r--r--src/particleemitter.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c7e265d6..e2a969e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
* src/game.cpp, src/gui/menuwindow.cpp, src/gui/itemcontainer.cpp,
src/main.cpp, src/CMakeLists.txt, src/net/inventoryhandler.cpp,
src/Makefile.am: Disabled non-functional item shortcut window.
+ * src/particleemitter.cpp: Fix compile warning.
2007-12-23 Philipp Sehmisch <tmw@crushnet.org>
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 7a465ec3..6f66b632 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -267,6 +267,8 @@ ParticleEmitter & ParticleEmitter::operator=(const ParticleEmitter &o)
mParticleChildEmitters = o.mParticleChildEmitters;
if (mParticleImage) mParticleImage->incRef();
+
+ return *this;
}