From 02e43428ee70874851b9a9775b8cfb579f859f80 Mon Sep 17 00:00:00 2001
From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Thu, 19 Apr 2012 11:03:29 +0400
Subject: [PATCH] Sync to changes in the data structure definitions.

---
 .../df/custom/block_burrow.methods.inc        | 17 +++------
 .../block_square_event_mineralst.methods.inc  | 16 +++-----
 .../df/custom/tile_bitmask.methods.inc        | 38 +++++++++++++++++++
 library/modules/Maps.cpp                      |  2 +-
 library/xml                                   |  2 +-
 plugins/devel/buildprobe.cpp                  |  2 +-
 6 files changed, 52 insertions(+), 25 deletions(-)
 create mode 100644 library/include/df/custom/tile_bitmask.methods.inc

diff --git a/library/include/df/custom/block_burrow.methods.inc b/library/include/df/custom/block_burrow.methods.inc
index 216a58662..3959fcf35 100644
--- a/library/include/df/custom/block_burrow.methods.inc
+++ b/library/include/df/custom/block_burrow.methods.inc
@@ -1,26 +1,21 @@
 inline bool getassignment( const df::coord2d &xy )
 {
-    return getassignment(xy.x,xy.y);
+    return tile_bitmask.getassignment(xy);
 }
 inline bool getassignment( int x, int y )
 {
-    return (tile_bitmask[y] & (1 << x));
+    return tile_bitmask.getassignment(x,y);
 }
 inline void setassignment( const df::coord2d &xy, bool bit )
 {
-    return setassignment(xy.x,xy.y, bit);
+    return tile_bitmask.setassignment(xy, bit);
 }
 inline void setassignment( int x, int y, bool bit )
 {
-    if(bit)
-        tile_bitmask[y] |= (1 << x);
-    else
-        tile_bitmask[y] &= ~(1 << x);
+    return tile_bitmask.setassignment(x, y, bit);
 }
 bool has_assignments()
 {
-    for (int i = 0; i < 16; i++)
-        if (tile_bitmask[i])
-            return true;
-    return false;
+    return tile_bitmask.has_assignments();
 }
+
diff --git a/library/include/df/custom/block_square_event_mineralst.methods.inc b/library/include/df/custom/block_square_event_mineralst.methods.inc
index 216a58662..4da4c65be 100644
--- a/library/include/df/custom/block_square_event_mineralst.methods.inc
+++ b/library/include/df/custom/block_square_event_mineralst.methods.inc
@@ -1,26 +1,20 @@
 inline bool getassignment( const df::coord2d &xy )
 {
-    return getassignment(xy.x,xy.y);
+    return tile_bitmask.getassignment(xy);
 }
 inline bool getassignment( int x, int y )
 {
-    return (tile_bitmask[y] & (1 << x));
+    return tile_bitmask.getassignment(x,y);
 }
 inline void setassignment( const df::coord2d &xy, bool bit )
 {
-    return setassignment(xy.x,xy.y, bit);
+    return tile_bitmask.setassignment(xy, bit);
 }
 inline void setassignment( int x, int y, bool bit )
 {
-    if(bit)
-        tile_bitmask[y] |= (1 << x);
-    else
-        tile_bitmask[y] &= ~(1 << x);
+    return tile_bitmask.setassignment(x, y, bit);
 }
 bool has_assignments()
 {
-    for (int i = 0; i < 16; i++)
-        if (tile_bitmask[i])
-            return true;
-    return false;
+    return tile_bitmask.has_assignments();
 }
diff --git a/library/include/df/custom/tile_bitmask.methods.inc b/library/include/df/custom/tile_bitmask.methods.inc
new file mode 100644
index 000000000..18b312a08
--- /dev/null
+++ b/library/include/df/custom/tile_bitmask.methods.inc
@@ -0,0 +1,38 @@
+inline uint16_t &operator[] (int y)
+{
+    return bits[y];
+}
+void clear()
+{
+    memset(bits,0,sizeof(bits));
+}
+void set_all()
+{
+    memset(bits,0xFF,sizeof(bits));
+}
+inline bool getassignment( const df::coord2d &xy )
+{
+    return getassignment(xy.x,xy.y);
+}
+inline bool getassignment( int x, int y )
+{
+    return (bits[y] & (1 << x));
+}
+inline void setassignment( const df::coord2d &xy, bool bit )
+{
+    return setassignment(xy.x,xy.y, bit);
+}
+inline void setassignment( int x, int y, bool bit )
+{
+    if(bit)
+        bits[y] |= (1 << x);
+    else
+        bits[y] &= ~(1 << x);
+}
+bool has_assignments()
+{
+    for (int i = 0; i < 16; i++)
+        if (bits[i])
+            return true;
+    return false;
+}
diff --git a/library/modules/Maps.cpp b/library/modules/Maps.cpp
index b45ae7191..06e525fea 100644
--- a/library/modules/Maps.cpp
+++ b/library/modules/Maps.cpp
@@ -1066,7 +1066,7 @@ df::block_burrow *Maps::getBlockBurrowMask(df::burrow *burrow, df::map_block *bl
         link->item = new df::block_burrow;
 
         link->item->id = burrow->id;
-        memset(link->item->tile_bitmask,0,sizeof(link->item->tile_bitmask));
+        link->item->tile_bitmask.clear();
         link->item->link = link;
 
         link->next = NULL;
diff --git a/library/xml b/library/xml
index e8036d3f1..a1e342afe 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit e8036d3f13c6be0141899baae90f605ad11d5385
+Subproject commit a1e342afe5a5e1e07672cd8b6553953bc251a05d
diff --git a/plugins/devel/buildprobe.cpp b/plugins/devel/buildprobe.cpp
index 6c360455a..17e95237f 100644
--- a/plugins/devel/buildprobe.cpp
+++ b/plugins/devel/buildprobe.cpp
@@ -119,7 +119,7 @@ command_result writeFlag (color_ostream &out, vector <string> & parameters)
     MapExtras::MapCache * MCache = new MapExtras::MapCache();
     t_occupancy oc = MCache->occupancyAt(cursor);
 
-    oc.bits.building = value;
+    oc.bits.building = df::tile_building_occ(value);
     MCache->setOccupancyAt(cursor, oc);
     MCache->WriteAll();