# HG changeset patch
# User Ritor1
# Date 1362579366 -21600
# Node ID 7bae884b7cd0649b27d4812a3bbaf1828fe4bdcb
# Parent  c615ff03b1446f13a9601d97cb6ad729ec6a1468# Parent  b5240254cbbd152e4464bf16392464a4bfa8b1c5
Слияние

diff -r b5240254cbbd -r 7bae884b7cd0 Chest.cpp
--- a/Chest.cpp	Wed Mar 06 16:51:39 2013 +0200
+++ b/Chest.cpp	Wed Mar 06 20:16:06 2013 +0600
@@ -581,21 +581,21 @@
     uChestArea = pChestWidthsByType[pChests[uChestID].uChestBitmapID] * pChestHeightsByType[pChests[uChestID].uChestBitmapID];
     memset(chest_cells_map, 0, 144);
     //fill cell map at random positions
-    for (items_counter = 0; items_counter<uChestArea; ++items_counter)
-        {
+    for ( items_counter = 0; items_counter < uChestArea; ++items_counter )
+    {
         //get random position in chest
         do
         random_chest_pos = (unsigned __int8)rand();
         while ( random_chest_pos >= uChestArea );
         //if this pos occupied move to next
         while ( chest_cells_map[random_chest_pos] )
-            {
+        {
             ++random_chest_pos;
             if ( random_chest_pos == uChestArea )
                 random_chest_pos = 0;
-            }
+        }
         chest_cells_map[random_chest_pos] = items_counter;
-        }
+      }
     items_counter = 0;
 
     for (items_counter = 0; items_counter<uChestArea; ++items_counter)
diff -r b5240254cbbd -r 7bae884b7cd0 mm7_1.cpp
diff -r b5240254cbbd -r 7bae884b7cd0 mm7_2.cpp
diff -r b5240254cbbd -r 7bae884b7cd0 mm7_3.cpp