diff options
Diffstat (limited to 'src/particle')
| -rw-r--r-- | src/particle/animationparticle.cpp | 6 | ||||
| -rw-r--r-- | src/particle/animationparticle.h | 6 | ||||
| -rw-r--r-- | src/particle/imageparticle.cpp | 8 | ||||
| -rw-r--r-- | src/particle/imageparticle.h | 6 | ||||
| -rw-r--r-- | src/particle/particle.cpp | 6 | ||||
| -rw-r--r-- | src/particle/particle.h | 6 | ||||
| -rw-r--r-- | src/particle/particlecontainer.cpp | 6 | ||||
| -rw-r--r-- | src/particle/particlecontainer.h | 6 | ||||
| -rw-r--r-- | src/particle/particleemitter.cpp | 8 | ||||
| -rw-r--r-- | src/particle/particleemitter.h | 6 | ||||
| -rw-r--r-- | src/particle/particleemitterprop.h | 11 | ||||
| -rw-r--r-- | src/particle/particleengine.cpp | 6 | ||||
| -rw-r--r-- | src/particle/particleengine.h | 6 | ||||
| -rw-r--r-- | src/particle/particleinfo.h | 6 | ||||
| -rw-r--r-- | src/particle/particlelist.cpp | 6 | ||||
| -rw-r--r-- | src/particle/particlelist.h | 6 | ||||
| -rw-r--r-- | src/particle/particletimer.h | 6 | ||||
| -rw-r--r-- | src/particle/particlevector.cpp | 6 | ||||
| -rw-r--r-- | src/particle/particlevector.h | 6 | ||||
| -rw-r--r-- | src/particle/rotationalparticle.cpp | 6 | ||||
| -rw-r--r-- | src/particle/rotationalparticle.h | 6 | ||||
| -rw-r--r-- | src/particle/textparticle.cpp | 8 | ||||
| -rw-r--r-- | src/particle/textparticle.h | 6 |
23 files changed, 79 insertions, 70 deletions
diff --git a/src/particle/animationparticle.cpp b/src/particle/animationparticle.cpp index fe79b004e..32619a55b 100644 --- a/src/particle/animationparticle.cpp +++ b/src/particle/animationparticle.cpp @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/animationparticle.h b/src/particle/animationparticle.h index f03b6508e..0fd8db5a7 100644 --- a/src/particle/animationparticle.h +++ b/src/particle/animationparticle.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/imageparticle.cpp b/src/particle/imageparticle.cpp index c350b2e90..cf2411e9a 100644 --- a/src/particle/imageparticle.cpp +++ b/src/particle/imageparticle.cpp @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,6 +27,8 @@ #include "resources/image/image.h" +#include "utils/performance.h" + #include "debug.h" StringIntMap ImageParticle::imageParticleCountByName; diff --git a/src/particle/imageparticle.h b/src/particle/imageparticle.h index 37949c706..85b1dd6cd 100644 --- a/src/particle/imageparticle.h +++ b/src/particle/imageparticle.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp index 4e5e038f0..0d60beff0 100644 --- a/src/particle/particle.cpp +++ b/src/particle/particle.cpp @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particle.h b/src/particle/particle.h index a7ef630bc..3fc37fb38 100644 --- a/src/particle/particle.h +++ b/src/particle/particle.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particlecontainer.cpp b/src/particle/particlecontainer.cpp index 1e7b115d1..b55083fe6 100644 --- a/src/particle/particlecontainer.cpp +++ b/src/particle/particlecontainer.cpp @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particlecontainer.h b/src/particle/particlecontainer.h index 0fa22ba3e..4b198ae0a 100644 --- a/src/particle/particlecontainer.h +++ b/src/particle/particlecontainer.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp index 9ec2eab36..f04c278c9 100644 --- a/src/particle/particleemitter.cpp +++ b/src/particle/particleemitter.cpp @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -236,7 +236,7 @@ ParticleEmitter::ParticleEmitter(XmlNodeConstPtrConst emitterNode, else if (name == "follow-parent") { const std::string value = XML::getProperty(propertyNode, - "value", "0"); + "value", "1"); if (value == "1" || value == "true") mParticleFollow = true; } diff --git a/src/particle/particleemitter.h b/src/particle/particleemitter.h index baabaae69..a334a3344 100644 --- a/src/particle/particleemitter.h +++ b/src/particle/particleemitter.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particleemitterprop.h b/src/particle/particleemitterprop.h index 6ef360d8e..0d1f9e5cb 100644 --- a/src/particle/particleemitterprop.h +++ b/src/particle/particleemitterprop.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,6 +30,11 @@ #include "localconsts.h" +// required by MSYS2 / Windows +#ifndef M_PI +#define M_PI 3.1415926535897932384626433832795 +#endif + template <typename T> struct ParticleEmitterProp final { ParticleEmitterProp() : diff --git a/src/particle/particleengine.cpp b/src/particle/particleengine.cpp index c8436a53b..02683ac4e 100644 --- a/src/particle/particleengine.cpp +++ b/src/particle/particleengine.cpp @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particleengine.h b/src/particle/particleengine.h index fc1bd19de..d4c8f22b6 100644 --- a/src/particle/particleengine.h +++ b/src/particle/particleengine.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particleinfo.h b/src/particle/particleinfo.h index 4aef420a8..0345e3543 100644 --- a/src/particle/particleinfo.h +++ b/src/particle/particleinfo.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2013-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particlelist.cpp b/src/particle/particlelist.cpp index 6c2e92b0e..432090162 100644 --- a/src/particle/particlelist.cpp +++ b/src/particle/particlelist.cpp @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particlelist.h b/src/particle/particlelist.h index f0d7ce47f..98b108b1f 100644 --- a/src/particle/particlelist.h +++ b/src/particle/particlelist.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particletimer.h b/src/particle/particletimer.h index c038a1cba..b4f852113 100644 --- a/src/particle/particletimer.h +++ b/src/particle/particletimer.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2015-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particlevector.cpp b/src/particle/particlevector.cpp index 08bf473b2..f51e1cd98 100644 --- a/src/particle/particlevector.cpp +++ b/src/particle/particlevector.cpp @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/particlevector.h b/src/particle/particlevector.h index 87436d7ef..520d3a977 100644 --- a/src/particle/particlevector.h +++ b/src/particle/particlevector.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2008-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/rotationalparticle.cpp b/src/particle/rotationalparticle.cpp index 33c859729..a59f97c94 100644 --- a/src/particle/rotationalparticle.cpp +++ b/src/particle/rotationalparticle.cpp @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/rotationalparticle.h b/src/particle/rotationalparticle.h index 96e01ad3e..8d3ff8910 100644 --- a/src/particle/rotationalparticle.h +++ b/src/particle/rotationalparticle.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/particle/textparticle.cpp b/src/particle/textparticle.cpp index f48740920..15517e018 100644 --- a/src/particle/textparticle.cpp +++ b/src/particle/textparticle.cpp @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +29,8 @@ #include "render/graphics.h" +#include "utils/performance.h" + #include "debug.h" TextParticle::TextParticle(const std::string &restrict text, diff --git a/src/particle/textparticle.h b/src/particle/textparticle.h index 532674f76..6d3aabe79 100644 --- a/src/particle/textparticle.h +++ b/src/particle/textparticle.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2006-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers * Copyright (C) 2011-2020 The ManaPlus Developers - * Copyright (C) 2020-2023 The ManaVerse Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |