From 1bf50808285938e8d37e4aab7770b2864b0103a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Wed, 15 Feb 2012 21:35:44 +0100
Subject: [PATCH] Fixage. Runs with 34.01

---
 library/modules/Maps.cpp | 11 ++++++-----
 library/xml              |  2 +-
 plugins/flows.cpp        |  6 +++---
 plugins/getplants.cpp    |  2 +-
 plugins/vdig.cpp         |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/library/modules/Maps.cpp b/library/modules/Maps.cpp
index 5a1ec5bad..ee793ac66 100644
--- a/library/modules/Maps.cpp
+++ b/library/modules/Maps.cpp
@@ -145,7 +145,7 @@ bool Maps::ReadBlock40d(uint32_t x, uint32_t y, uint32_t z, mapblock40d * buffer
         buffer->local_feature = block->local_feature;
         buffer->mystery = block->unk2;
         buffer->origin = block;
-        buffer->blockflags.whole = block->flags.as_int();
+        buffer->blockflags.whole = block->flags.whole;
         return true;
     }
     return false;
@@ -185,7 +185,7 @@ bool Maps::ReadDirtyBit(uint32_t x, uint32_t y, uint32_t z, bool &dirtybit)
     df::map_block *block = getBlock(x,y,z);
     if (block)
     {
-        dirtybit = block->flags.is_set(block_flags::Designated);
+        dirtybit = block->flags.bits.designated;
         return true;
     }
     return false;
@@ -196,7 +196,7 @@ bool Maps::WriteDirtyBit(uint32_t x, uint32_t y, uint32_t z, bool dirtybit)
     df::map_block *block = getBlock(x,y,z);
     if (block)
     {
-        block->flags.set(block_flags::Designated, dirtybit);
+        block->flags.bits.designated = true;
         return true;
     }
     return false;
@@ -211,7 +211,7 @@ bool Maps::ReadBlockFlags(uint32_t x, uint32_t y, uint32_t z, t_blockflags &bloc
     df::map_block *block = getBlock(x,y,z);
     if (block)
     {
-        blockflags.whole = block->flags.as_int();
+        blockflags.whole = block->flags.whole;
         return true;
     }
     return false;
@@ -222,7 +222,8 @@ bool Maps::WriteBlockFlags(uint32_t x, uint32_t y, uint32_t z, t_blockflags bloc
     df::map_block *block = getBlock(x,y,z);
     if (block)
     {
-        return (block->flags = blockflags.whole);
+        block->flags.whole = blockflags.whole;
+        return true;
     }
     return false;
 }
diff --git a/library/xml b/library/xml
index 6696efc85..bfc15c208 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 6696efc85f55a6cc32161a247d5a1ca6c15344d2
+Subproject commit bfc15c2083e525cb1f7a9dae6d0594c6bbcaff63
diff --git a/plugins/flows.cpp b/plugins/flows.cpp
index d439bd9f9..f639e9e9e 100644
--- a/plugins/flows.cpp
+++ b/plugins/flows.cpp
@@ -27,11 +27,11 @@ command_result df_flows (Core * c, vector <string> & parameters)
     for (size_t i = 0; i < world->map.map_blocks.size(); i++)
     {
         df::map_block *cur = world->map.map_blocks[i];
-        if (cur->flags.is_set(block_flags::UpdateLiquid))
+        if (cur->flags.bits.update_liquid)
             flow1++;
-        if (cur->flags.is_set(block_flags::UpdateLiquidTwice))
+        if (cur->flags.bits.update_liquid_twice)
             flow2++;
-        if (cur->flags.is_set(block_flags::UpdateLiquid) && cur->flags.is_set(block_flags::UpdateLiquidTwice))
+        if (cur->flags.bits.update_liquid && cur->flags.bits.update_liquid_twice)
             flowboth++;
         for (int x = 0; x < 16; x++)
         {
diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index 5293a77a5..e1d483d8f 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -127,7 +127,7 @@ command_result df_getplants (Core * c, vector <string> & parameters)
             }
         }
         if (dirty)
-            cur->flags.set(block_flags::Designated);
+            cur->flags.bits.designated = true;
     }
     if (count)
         c->con.print("Updated %d plant designations.\n", count);
diff --git a/plugins/vdig.cpp b/plugins/vdig.cpp
index 4e6e018d9..ae9914afb 100644
--- a/plugins/vdig.cpp
+++ b/plugins/vdig.cpp
@@ -773,7 +773,7 @@ bool stamp_pattern (uint32_t bx, uint32_t by, int z_level,
             }
         }
     }
-    bl->flags.set(block_flags::Designated);
+    bl->flags.bits.designated = true;
     return true;
 };