summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Sehmisch <crush@themanaworld.org>2008-12-14 03:48:22 +0100
committerPhilipp Sehmisch <crush@themanaworld.org>2008-12-14 03:49:22 +0100
commit29d2ab82cfcc7dece075c6371da16304fef3eceb (patch)
treefff524e7733c642bbf7a81730cf0b1fe0593e72b
parent864e33db117a28256a89d03e750b38df044bee6e (diff)
downloadmana-29d2ab82cfcc7dece075c6371da16304fef3eceb.tar.gz
mana-29d2ab82cfcc7dece075c6371da16304fef3eceb.tar.bz2
mana-29d2ab82cfcc7dece075c6371da16304fef3eceb.tar.xz
mana-29d2ab82cfcc7dece075c6371da16304fef3eceb.zip
Fixed follow-parent of nested and being-following particle emitters
-rw-r--r--src/particle.cpp1
-rw-r--r--tmw.cbp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/particle.cpp b/src/particle.cpp
index 2f274a5c..f1f80e50 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -243,7 +243,6 @@ void Particle::moveBy(Vector change)
(*p)->moveBy(change);
}
}
- return;
}
void Particle::moveTo(float x, float y)
diff --git a/tmw.cbp b/tmw.cbp
index 221c709f..2129e4c4 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -66,7 +66,7 @@
<Add alias="All" targets="default;" />
</VirtualTargets>
<Compiler>
- <Add directory="..\..\..\..\..\..\mingw\include\SDL" />
+ <Add directory="D:\tmw\client-eAthena\src\" />
</Compiler>
<Unit filename="src\animatedsprite.cpp" />
<Unit filename="src\animatedsprite.h" />