added tile flags in main

diff --git a/src/main.cpp b/src/main.cpp
index f6a069c2331eb73a695de2a7f1a3a87c858b4243..ce45985f3a647d33323ab2e37e374a5d54a2710b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -237,72 +237,72 @@ int main(int argc, char **argv) {
                Tile tiles[64];
 
                tiles[ 0].SetOffset(Vector<int>(2, 1));
-               tiles[ 1].SetOffset(Vector<int>(4, 0));
-               tiles[ 2].SetOffset(Vector<int>(3, 0));
-               tiles[ 3].SetOffset(Vector<int>(3, 0));
+               tiles[ 1].SetOffset(Vector<int>(4, 0)).SetFlags(Tile::BLOCK_NORTH | Tile::BLOCK_WEST);
+               tiles[ 2].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_NORTH);
+               tiles[ 3].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_NORTH | Tile::BLOCK_EAST);
                tiles[ 4].SetOffset(Vector<int>(0, 1));
                tiles[ 5].SetOffset(Vector<int>(2, 0));
                tiles[ 6].SetOffset(Vector<int>(2, 0));
                tiles[ 7].SetOffset(Vector<int>(2, 0));
 
                tiles[ 8].SetOffset(Vector<int>(2, 1));
-               tiles[ 9].SetOffset(Vector<int>(4, 0));
+               tiles[ 9].SetOffset(Vector<int>(4, 0)).SetFlags(Tile::BLOCK_WEST);
                tiles[10].SetOffset(Vector<int>(3, 0));
-               tiles[11].SetOffset(Vector<int>(3, 0));
+               tiles[11].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_EAST);
                tiles[12].SetOffset(Vector<int>(0, 2));
                tiles[13].SetOffset(Vector<int>(1, 2));
                tiles[14].SetOffset(Vector<int>(1, 2));
                tiles[15].SetOffset(Vector<int>(1, 2));
 
                tiles[16].SetOffset(Vector<int>(2, 1));
-               tiles[17].SetOffset(Vector<int>(4, 0));
+               tiles[17].SetOffset(Vector<int>(4, 0)).SetFlags(Tile::BLOCK_WEST);
                tiles[18].SetOffset(Vector<int>(3, 0));
-               tiles[19].SetOffset(Vector<int>(3, 0));
+               tiles[19].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_EAST);
                tiles[20].SetOffset(Vector<int>(0, 3));
                tiles[21].SetOffset(Vector<int>(1, 3));
                tiles[22].SetOffset(Vector<int>(1, 3));
                tiles[23].SetOffset(Vector<int>(2, 3));
 
                tiles[24].SetOffset(Vector<int>(2, 1));
-               tiles[25].SetOffset(Vector<int>(4, 0));
+               tiles[25].SetOffset(Vector<int>(4, 0)).SetFlags(Tile::BLOCK_WEST);
                tiles[26].SetOffset(Vector<int>(3, 0));
-               tiles[27].SetOffset(Vector<int>(3, 0));
+               tiles[27].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_EAST);
                tiles[28].SetOffset(Vector<int>(0, 4));
                tiles[29].SetOffset(Vector<int>(1, 4));
                tiles[30].SetOffset(Vector<int>(1, 4));
                tiles[31].SetOffset(Vector<int>(2, 4));
 
                tiles[32].SetOffset(Vector<int>(2, 1));
-               tiles[33].SetOffset(Vector<int>(4, 0));
+               tiles[33].SetOffset(Vector<int>(4, 0)).SetFlags(Tile::BLOCK_WEST);
                tiles[34].SetOffset(Vector<int>(3, 0));
                tiles[35].SetOffset(Vector<int>(3, 0));
-               tiles[36].SetOffset(Vector<int>(3, 0));
-               tiles[37].SetOffset(Vector<int>(3, 0));
-               tiles[38].SetOffset(Vector<int>(3, 0));
-               tiles[39].SetOffset(Vector<int>(3, 0));
+               tiles[36].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_NORTH);
+               tiles[37].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_NORTH);
+               tiles[38].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_NORTH);
+               tiles[39].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_NORTH | Tile::BLOCK_EAST);
 
                tiles[40].SetOffset(Vector<int>(2, 1));
-               tiles[41].SetOffset(Vector<int>(4, 0));
+               tiles[41].SetOffset(Vector<int>(4, 0)).SetFlags(Tile::BLOCK_WEST);
                tiles[42].SetOffset(Vector<int>(3, 0));
                tiles[43].SetOffset(Vector<int>(3, 0));
-               tiles[44].SetOffset(Vector<int>(3, 0));
-               tiles[45].SetOffset(Vector<int>(4, 0));
-               tiles[46].SetOffset(Vector<int>(4, 0));
-               tiles[47].SetOffset(Vector<int>(4, 0));
+               tiles[44].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_SOUTH);
+               tiles[45].SetOffset(Vector<int>(4, 0)).SetFlags(Tile::BLOCK_SOUTH);
+               tiles[46].SetOffset(Vector<int>(4, 0)).SetFlags(Tile::BLOCK_SOUTH);
+               tiles[47].SetOffset(Vector<int>(4, 0)).SetFlags(Tile::BLOCK_SOUTH | Tile::BLOCK_EAST);
 
                tiles[48].SetOffset(Vector<int>(2, 1));
-               tiles[49].SetOffset(Vector<int>(4, 0));
+               tiles[49].SetOffset(Vector<int>(4, 0)).SetFlags(Tile::BLOCK_WEST);
                tiles[50].SetOffset(Vector<int>(3, 0));
-               tiles[51].SetOffset(Vector<int>(3, 0));
+               tiles[51].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_EAST);
                tiles[52].SetOffset(Vector<int>(0, 0));
                tiles[53].SetOffset(Vector<int>(1, 0));
                tiles[54].SetOffset(Vector<int>(1, 0));
                tiles[55].SetOffset(Vector<int>(1, 0));
 
                tiles[56].SetOffset(Vector<int>(2, 1));
-               tiles[57].SetOffset(Vector<int>(4, 0));
-               tiles[58].SetOffset(Vector<int>(3, 0));
-               tiles[59].SetOffset(Vector<int>(3, 0));
+               tiles[57].SetOffset(Vector<int>(4, 0)).SetFlags(Tile::BLOCK_SOUTH | Tile::BLOCK_WEST);
+               tiles[58].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_SOUTH);
+               tiles[59].SetOffset(Vector<int>(3, 0)).SetFlags(Tile::BLOCK_SOUTH | Tile::BLOCK_EAST);
                tiles[60].SetOffset(Vector<int>(0, 1));
                tiles[61].SetOffset(Vector<int>(1, 1));
                tiles[62].SetOffset(Vector<int>(1, 1));

diff --git a/src/map/Tile.h b/src/map/Tile.h
index d21de56d25fe2afbdacdc8a4735a06550dd8aaf1..88db623ed0cdb5e8f24e2949f924ac3dc697b06c 100644 (file)
--- a/src/map/Tile.h
+++ b/src/map/Tile.h
@@ -37,8 +37,8 @@ public:
 
 // temporary setters
 public:
-       void SetOffset(const geometry::Vector<int> &o) { offset = o; }
-       void SetFlags(Uint32 f) { flags = f; }
+       Tile &SetOffset(const geometry::Vector<int> &o) { offset = o; return *this; }
+       Tile &SetFlags(Uint32 f) { flags = f; return *this; }
 
 private:
        geometry::Vector<int> offset;