Merged CHECK macro branch

1 files changed, 15 insertions, 36 deletions

diff --git a/sigmod/MapTile.cpp b/sigmod/MapTile.cpp
index c407c5e2..bc978319 100644
--- a/sigmod/MapTile.cpp
+++ b/sigmod/MapTile.cpp
@@ -58,8 +58,8 @@ Sigmod::MapTile::~MapTile()
 void Sigmod::MapTile::validate()
 {
     TEST_BEGIN();
-    TEST(setTile, tile);
-    TEST(setPosition, position);
+    TEST(tile);
+    TEST(position);
     TEST_END();
 }
 
@@ -80,42 +80,21 @@ QDomElement Sigmod::MapTile::save() const
     return xml;
 }
 
-void Sigmod::MapTile::setTile(const int tile)
-{
-    if (!sigmod()->tileById(tile))
-        emit(error(bounds("tile", tile)));
-    else
-        CHECK(tile);
-}
+SETTER(MapTile, int, Tile, tile)
+SETTER(MapTile, QPoint&, Position, position)
+SETTER(MapTile, int, ZIndex, zIndex)
 
-void Sigmod::MapTile::setPosition(const QPoint& position)
-{
-    const Map* map = qobject_cast<const Map*>(parent());
-    if ((position.x() < 0) || (position.y() < 0) || (map->width() <= position.x()) || (map->height() <= position.y()))
-        emit(error(bounds("position", QPoint(0, 0), QPoint(map->width(), map->height()), position)));
-    else
-        CHECK(position);
-}
+GETTER(MapTile, int, tile)
+GETTER(MapTile, QPoint, position)
+GETTER(MapTile, int, zIndex)
 
-void Sigmod::MapTile::setZIndex(const int zIndex)
-{
-    CHECK(zIndex);
-}
-
-int Sigmod::MapTile::tile() const
-{
-    return m_tile;
-}
-
-QPoint Sigmod::MapTile::position() const
-{
-    return m_position;
-}
-
-int Sigmod::MapTile::zIndex() const
-{
-    return m_zIndex;
-}
+CHECK_INDEX(MapTile, int, tile, sigmod(), tile)
+CHECK_BEGIN(MapTile, QPoint&, position)
+    const Map* map = qobject_cast<const Map*>(parent());
+    TBOUNDS_MOD(position_x, 0, map->width() - 1, position.x())
+    TBOUNDS_MOD(position_y, 0, map->height() - 1, position.y())
+CHECK_END()
+CHECK(MapTile, int, zIndex)
 
 Sigmod::MapTile& Sigmod::MapTile::operator=(const MapTile& rhs)
 {