summaryrefslogtreecommitdiffstats
path: root/sigmod/Map.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sigmod/Map.cpp')
-rw-r--r--sigmod/Map.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/sigmod/Map.cpp b/sigmod/Map.cpp
index 582e5967..8f61587b 100644
--- a/sigmod/Map.cpp
+++ b/sigmod/Map.cpp
@@ -41,7 +41,6 @@ Sigmod::Map::Map(const Map& map) :
Sigmod::Map::Map(const Sigmod* parent, const int id) :
Object(parent, id),
m_name(""),
- m_flyWarp(-1),
m_type(Outdoor),
m_width(1),
m_height(1)
@@ -71,7 +70,6 @@ void Sigmod::Map::validate()
TEST_BEGIN();
if (m_name.isEmpty())
emit(error("Name is empty"));
- TEST(flyWarp);
TEST(width);
TEST(height);
QSet<int> idChecker;
@@ -117,7 +115,6 @@ void Sigmod::Map::load(const QDomElement& xml)
{
LOAD_BEGIN();
LOAD(name);
- LOAD(flyWarp);
LOAD_ENUM(type, Type);
LOAD(width);
LOAD(height);
@@ -132,7 +129,6 @@ QDomElement Sigmod::Map::save() const
{
SAVE_CREATE();
SAVE(name);
- SAVE(flyWarp);
SAVE_ENUM(type, Type);
SAVE(width);
SAVE(height);
@@ -145,25 +141,16 @@ QDomElement Sigmod::Map::save() const
}
SETTER(Map, QString&, Name, name)
-SETTER(Map, int, FlyWarp, flyWarp)
SETTER(Map, Type, Type, type)
SETTER(Map, int, Width, width)
SETTER(Map, int, Height, height)
GETTER(Map, QString, name)
-GETTER(Map, int, flyWarp)
GETTER(Map, Sigmod::Map::Type, type)
GETTER(Map, int, width)
GETTER(Map, int, height)
CHECK(Map, QString&, name)
-CHECK_BEGIN(Map, int, flyWarp)
- if ((flyWarp != -1) && !warpById(flyWarp))
- {
- EBOUNDS_IDX(flyWarp);
- return false;
- }
-CHECK_END()
CHECK(Map, Type, type)
CHECK_BOUNDS(Map, int, width, 1, INT_MAX)
CHECK_BOUNDS(Map, int, height, 1, INT_MAX)
@@ -180,7 +167,6 @@ Sigmod::Map& Sigmod::Map::operator=(const Map& rhs)
return *this;
clear();
COPY(name);
- COPY(flyWarp);
COPY(type);
COPY(width);
COPY(height);