Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'

Conflicts:
	AUTHORS
	CMakeLists.txt
	ChangeLog
	INSTALL
	README
	aethyra.cbp
	configure.ac
	data/help/changes.txt
	data/help/commands.txt
	data/help/header.txt
	data/help/support.txt
	src/Makefile.am
	src/aethyra.rc
	src/being.cpp
	src/being.h
	src/equipment.cpp
	src/equipment.h
	src/floor_item.h
	src/game.cpp
	src/gui/buddywindow.cpp
	src/gui/char_select.cpp
	src/gui/char_server.cpp
	src/gui/chat.cpp
	src/gui/chat.h
	src/gui/equipmentwindow.cpp
	src/gui/equipmentwindow.h
	src/gui/gui.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/itemcontainer.h
	src/gui/minimap.cpp
	src/gui/ministatus.cpp
	src/gui/newskill.cpp
	src/gui/npc_text.cpp
	src/gui/npclistdialog.h
	src/gui/ok_dialog.cpp
	src/gui/setup_video.cpp
	src/gui/skill.cpp
	src/gui/skill.h
	src/gui/status.h
	src/gui/table_model.h
	src/gui/updatewindow.cpp
	src/gui/viewport.cpp
	src/inventory.cpp
	src/inventory.h
	src/keyboardconfig.cpp
	src/keyboardconfig.h
	src/localplayer.cpp
	src/localplayer.h
	src/logindata.h
	src/main.cpp
	src/map.cpp
	src/monster.cpp
	src/monster.h
	src/net/beinghandler.cpp
	src/net/beinghandler.h
	src/net/buysellhandler.cpp
	src/net/equipmenthandler.cpp
	src/net/loginhandler.cpp
	src/net/loginhandler.h
	src/net/network.h
	src/net/npchandler.cpp
	src/net/playerhandler.cpp
	src/net/protocol.h
	src/net/tradehandler.cpp
	src/npc.cpp
	src/npc.h
	src/particleemitter.cpp
	src/particleemitterprop.h
	src/player.cpp
	src/player.h
	src/player_relations.cpp
	src/resources/imageset.cpp
	src/resources/imageset.h
	src/resources/itemdb.cpp
	src/resources/mapreader.cpp
	src/resources/monsterinfo.h
	src/text.cpp
	src/text.h
	src/textmanager.cpp
	src/textmanager.h
	src/tileset.h
	src/utils/fastsqrt.h
	src/utils/strprintf.cpp
	src/winver.h
	tools/tmxcopy/Makefile
	tools/tmxcopy/base64.cpp
	tools/tmxcopy/base64.h
	tools/tmxcopy/tostring.h

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 177 insertions, 0 deletions

diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp
new file mode 100644
index 00000000..12ef5733
--- /dev/null
+++ b/src/particlecontainer.cpp
@@ -0,0 +1,177 @@
+/*
+ *  The Mana World
+ *  Copyright 2008 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <cassert>
+
+#include "particlecontainer.h"
+
+
+ParticleContainer::ParticleContainer(ParticleContainer *parent, bool delParent) :
+    mDelParent(delParent),
+    mNext(parent)
+{};
+
+ParticleContainer::~ParticleContainer()
+{
+    clearLocally();
+    if (mNext && mDelParent)
+        delete mNext;
+}
+
+void
+ParticleContainer::clear()
+{
+    clearLocally();
+    if (mNext)
+        mNext->clear();
+}
+
+
+void
+ParticleContainer::setPositions(float x, float y)
+{
+    if (mNext)
+        mNext->setPositions(x, y);
+}
+
+// -- particle list ----------------------------------------
+
+ParticleList::ParticleList(ParticleContainer *parent, bool delParent) :
+    ParticleContainer(parent, delParent) {};
+
+ParticleList::~ParticleList() {}
+
+void
+ParticleList::addLocally(Particle *particle)
+{
+    if (particle)
+    {
+        // The effect may not die without the beings permission or we segfault
+        particle->disableAutoDelete();
+        mElements.push_back(particle);
+    }
+}
+
+void
+ParticleList::removeLocally(Particle *particle)
+{
+    for (std::list<Particle *>::iterator it = mElements.begin();
+         it != mElements.end(); it++)
+        if (*it == particle) {
+            (*it)->kill();
+            mElements.erase(it);
+        }
+}
+
+void
+ParticleList::clearLocally()
+{
+    for (std::list<Particle *>::iterator it = mElements.begin();
+         it != mElements.end(); it++)
+        (*it)->kill();
+    
+    mElements.clear();
+}
+
+void
+ParticleList::setPositions(float x, float y)
+{
+    ParticleContainer::setPositions(x, y);
+
+    for (std::list<Particle *>::iterator it = mElements.begin();
+         it != mElements.end();)
+    {
+        (*it)->setPosition(x, y);
+        if ((*it)->isExtinct())
+        {
+            (*it)->kill();
+            it = mElements.erase(it);
+        }
+        else
+            it++;
+    }
+}
+
+
+
+
+// -- particle vector ----------------------------------------
+
+ParticleVector::ParticleVector(ParticleContainer *parent, bool delParent) :
+    ParticleContainer(parent, delParent) {};
+
+ParticleVector::~ParticleVector() {};
+
+void
+ParticleVector::setLocally(int index, Particle *particle)
+{
+    assert(index >= 0);
+
+    delLocally(index);
+
+    if (mIndexedElements.size() <= (unsigned) index)
+        mIndexedElements.resize(index + 1, NULL);
+
+    mIndexedElements[index] = particle;
+}
+
+void
+ParticleVector::delLocally(int index)
+{
+    assert(index >= 0);
+
+    if (mIndexedElements.size() <= (unsigned) index)
+        return;
+
+    Particle *p = mIndexedElements[index];
+    if (p)
+    {
+        mIndexedElements[index] = NULL;
+        p->kill();
+    }
+}
+
+void
+ParticleVector::clearLocally()
+{
+    for (unsigned int i = 0; i < mIndexedElements.size(); i++)
+        delLocally(i);
+}
+
+void
+ParticleVector::setPositions(float x, float y)
+{
+    ParticleContainer::setPositions(x, y);
+
+    for (std::vector<Particle *>::iterator it = mIndexedElements.begin();
+         it != mIndexedElements.end(); it++)
+        if (*it)
+        {
+            (*it)->setPosition(x, y);
+
+            if ((*it)->isExtinct())
+            {
+                (*it)->kill();
+                *it = NULL;
+            }
+        }
+}
+