mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
fe2cbf8fbc
The property was not deleting the shape object it owned, but adding the delete was not enough. When the property is copied, it is necessary to copy the shape object. In order to verify, add an integration test which simulates the normal scenario of copying properites, just like in the StatisticsPropertyintegration test.
113 lines
2.8 KiB
C++
113 lines
2.8 KiB
C++
// Cyphesis Online RPG Server and AI Engine
|
|
// Copyright (C) 2004 Alistair Riddoch
|
|
//
|
|
// 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
|
|
// the Free Software Foundation; either version 2 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program 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 this program; if not, write to the Free Software Foundation,
|
|
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
// $Id$
|
|
|
|
#include "AreaProperty.h"
|
|
|
|
#include "common/debug.h"
|
|
#include <common/log.h>
|
|
#include "common/type_utils_impl.h"
|
|
|
|
#include "physics/Shape.h"
|
|
|
|
#include <wfmath/atlasconv.h>
|
|
|
|
#include <sstream>
|
|
#include <iostream>
|
|
|
|
#include <cassert>
|
|
|
|
static const bool debug_flag = false;
|
|
|
|
using Atlas::Message::Element;
|
|
using Atlas::Message::ListType;
|
|
using Atlas::Message::MapType;
|
|
|
|
AreaProperty::AreaProperty(const AreaProperty & other) : m_layer(other.m_layer),
|
|
m_shape(0)
|
|
{
|
|
if (other.m_shape != 0) {
|
|
m_shape = other.m_shape->copy();
|
|
}
|
|
}
|
|
|
|
/// \brief AreaProperty constructor
|
|
///
|
|
/// @param flags Flags used to persist this property
|
|
AreaProperty::AreaProperty() : m_layer(0), m_shape(0)
|
|
{
|
|
}
|
|
|
|
AreaProperty::~AreaProperty()
|
|
{
|
|
delete m_shape;
|
|
}
|
|
|
|
void AreaProperty::apply(LocatedEntity * owner)
|
|
{
|
|
if (m_shape == 0) {
|
|
log(ERROR, "Terrain area has no shape to apply");
|
|
return;
|
|
}
|
|
|
|
const TerrainProperty * terrain = getTerrain(owner);
|
|
|
|
if (terrain == 0) {
|
|
log(ERROR, "Terrain area could not find terrain");
|
|
return;
|
|
}
|
|
|
|
/// \todo Write the code to handle all the Mercator stuff
|
|
}
|
|
|
|
void AreaProperty::set(const Element & ent)
|
|
{
|
|
if (!ent.isMap()) {
|
|
return;
|
|
}
|
|
m_data = ent.Map();
|
|
|
|
MapType::const_iterator I = m_data.find("shape");
|
|
MapType::const_iterator Iend = m_data.end();
|
|
|
|
if (I == m_data.end() || !I->second.isMap()) {
|
|
log(ERROR, "Area shape data missing or is not map");
|
|
return;
|
|
}
|
|
Shape * shape = Shape::newFromAtlas(I->second.Map());
|
|
if (shape == 0) {
|
|
return;
|
|
}
|
|
// FIXME overwriting old pointer
|
|
m_shape = dynamic_cast<Form<2> *>(shape);
|
|
if (m_shape == 0) {
|
|
return;
|
|
}
|
|
|
|
I = m_data.find("layer");
|
|
if (I != Iend && I->second.isInt()) {
|
|
m_layer = I->second.Int();
|
|
} else {
|
|
m_layer = 0;
|
|
}
|
|
}
|
|
|
|
AreaProperty * AreaProperty::copy() const
|
|
{
|
|
return new AreaProperty(*this);
|
|
}
|