summaryrefslogtreecommitdiffstats
path: root/sigmod/MapEffect.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sigmod/MapEffect.cpp')
-rw-r--r--sigmod/MapEffect.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/sigmod/MapEffect.cpp b/sigmod/MapEffect.cpp
index 241a7ce3..66a90dc6 100644
--- a/sigmod/MapEffect.cpp
+++ b/sigmod/MapEffect.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2007-2009 Ben Boeckel <MathStuf@gmail.com>
*
* 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
@@ -32,7 +32,7 @@ Sigmod::MapEffect::MapEffect(const MapEffect& effect) :
Sigmod::MapEffect::MapEffect(const Map* parent, const int id) :
Object(parent, id),
m_name(""),
- m_coordinate(0, 0),
+ m_position(0, 0),
m_skin(-1),
m_isGhost(false),
m_script("", "")
@@ -57,7 +57,7 @@ void Sigmod::MapEffect::validate()
TEST_BEGIN();
if (m_name.isEmpty())
emit(error("Name is empty"));
- TEST(coordinate);
+ TEST(position);
TEST(skin);
TEST_END();
}
@@ -66,7 +66,7 @@ void Sigmod::MapEffect::load(const QDomElement& xml)
{
LOAD_BEGIN();
LOAD(name);
- LOAD(coordinate);
+ LOAD(position);
LOAD(skin);
LOAD(isGhost);
LOAD(script);
@@ -76,7 +76,7 @@ QDomElement Sigmod::MapEffect::save() const
{
SAVE_CREATE();
SAVE(name);
- SAVE(coordinate);
+ SAVE(position);
SAVE(skin);
SAVE(isGhost);
SAVE(script);
@@ -84,22 +84,22 @@ QDomElement Sigmod::MapEffect::save() const
}
SETTER(MapEffect, QString&, Name, name)
-SETTER(MapEffect, QPoint&, Coordinate, coordinate)
+SETTER(MapEffect, QPoint&, Position, position)
SETTER(MapEffect, int, Skin, skin)
SETTER(MapEffect, bool, IsGhost, isGhost)
SETTER(MapEffect, Sigcore::Script&, Script, script)
GETTER(MapEffect, QString, name)
-GETTER(MapEffect, QPoint, coordinate)
+GETTER(MapEffect, QPoint, position)
GETTER(MapEffect, int, skin)
GETTER(MapEffect, bool, isGhost)
GETTER(MapEffect, Sigcore::Script, script)
CHECK(MapEffect, QString&, name)
-CHECK_BEGIN(MapEffect, QPoint&, coordinate)
+CHECK_BEGIN(MapEffect, QPoint&, position)
const Map* map = qobject_cast<const Map*>(parent());
- TBOUNDS_MOD(coordinate_x, 0, map->width() - 1, coordinate.x())
- TBOUNDS_MOD(coordinate_y, 0, map->height() - 1, coordinate.y())
+ TBOUNDS_MOD(position_x, 0, map->width() - 1, position.x())
+ TBOUNDS_MOD(position_y, 0, map->height() - 1, position.y())
CHECK_END()
CHECK_INDEX(MapEffect, int, skin, sigmod(), skin)
CHECK(MapEffect, bool, isGhost)
@@ -110,7 +110,7 @@ Sigmod::MapEffect& Sigmod::MapEffect::operator=(const MapEffect& rhs)
if (this == &rhs)
return *this;
COPY(name);
- COPY(coordinate);
+ COPY(position);
COPY(skin);
COPY(isGhost);
COPY(script);