# HG changeset patch
# User Ritor1
# Date 1362744043 -21600
# Node ID 8a0ec99a517784735e60888b5102f40576da9f09
# Parent  7cb26ceb71072e219743e3663ff73be26253ed2c# Parent  cfca6297e4ae98d7a58a62cb9340ceda0de67e6a
Слияние

diff -r cfca6297e4ae -r 8a0ec99a5177 Chest.cpp
--- a/Chest.cpp	Fri Mar 08 00:36:33 2013 +0400
+++ b/Chest.cpp	Fri Mar 08 18:00:43 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 cfca6297e4ae -r 8a0ec99a5177 Events.cpp
--- a/Events.cpp	Fri Mar 08 00:36:33 2013 +0400
+++ b/Events.cpp	Fri Mar 08 18:00:43 2013 +0600
@@ -945,7 +945,7 @@
 				else 	if ( player_choose == 5 )//all
 				{
 					v130 = 0;
-					for(int i = 0; i < 5; ++i)
+					for(int i = 1; i < 5; ++i)
 					{
 						if ( pPlayers[i]->SubtractVariable((enum VariableType)EVT_WORD(_evt->v5), pValue) )
 							break;
diff -r cfca6297e4ae -r 8a0ec99a5177 mm7_1.cpp
diff -r cfca6297e4ae -r 8a0ec99a5177 mm7_2.cpp
diff -r cfca6297e4ae -r 8a0ec99a5177 mm7_3.cpp
diff -r cfca6297e4ae -r 8a0ec99a5177 mm7_4.cpp
--- a/mm7_4.cpp	Fri Mar 08 00:36:33 2013 +0400
+++ b/mm7_4.cpp	Fri Mar 08 18:00:43 2013 +0600
@@ -13952,7 +13952,6 @@
 
 
 
-
 //----- (00444732) --------------------------------------------------------
 char *GetEventHintString(unsigned int uEventID)
 {