# HG changeset patch
# User Ritor1
# Date 1362304678 -21600
# Node ID ec3546510fa104a94f4f2b05ddb371ee43701c03
# Parent  9d3d8091251b750d7f38badb5f3b9c1dd139c189# Parent  6e4619fb5808956e828ad1ad873f8ae9352b8ac6
Слияние

diff -r 6e4619fb5808 -r ec3546510fa1 Chest.cpp
diff -r 6e4619fb5808 -r ec3546510fa1 Chest.h
diff -r 6e4619fb5808 -r ec3546510fa1 Events.cpp
diff -r 6e4619fb5808 -r ec3546510fa1 MM7.vcxproj.filters
--- a/MM7.vcxproj.filters	Sun Mar 03 13:38:12 2013 +0400
+++ b/MM7.vcxproj.filters	Sun Mar 03 15:57:58 2013 +0600
@@ -127,7 +127,6 @@
     <ClInclude Include="mm7_data.h" />
     <ClInclude Include="Allocator.h" />
     <ClInclude Include="IndoorCamera.h" />
-    <ClInclude Include="LayingItem.h" />
     <ClInclude Include="Viewport.h" />
     <ClInclude Include="MapInfo.h" />
     <ClInclude Include="PlayerFrameTable.h" />
@@ -202,6 +201,7 @@
     <ClInclude Include="resource.h" />
     <ClInclude Include="stru346.h" />
     <ClInclude Include="texts.h" />
+    <ClInclude Include="SpriteObject.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="lib">
@@ -258,7 +258,6 @@
     <ClCompile Include="stru6.cpp" />
     <ClCompile Include="AudioPlayer.cpp" />
     <ClCompile Include="GUIButton.cpp" />
-    <ClCompile Include="LayingItem.cpp" />
     <ClCompile Include="VideoPlayer.cpp" />
     <ClCompile Include="GUIProgressBar.cpp" />
     <ClCompile Include="TileFrameTable.h" />
@@ -321,6 +320,7 @@
     <ClCompile Include="texts.cpp" />
     <ClCompile Include="mm7text_ru.cpp" />
     <ClCompile Include="NPC.cpp" />
+    <ClCompile Include="SpriteObject.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Might and Magic Trilogy.rc" />
diff -r 6e4619fb5808 -r ec3546510fa1 mm7_2.cpp
--- a/mm7_2.cpp	Sun Mar 03 13:38:12 2013 +0400
+++ b/mm7_2.cpp	Sun Mar 03 15:57:58 2013 +0600
@@ -13213,14 +13213,14 @@
   assert(sizeof(RenderD3D) == 0x148);
   assert(sizeof(Render) == 0x129844);
   assert(sizeof(Player) == 0x1B3C);
-  assert(sizeof(Party_stru0) == 0x678);
-  assert(sizeof(Party) == 0x16238);
+  //assert(sizeof(Party_stru0) == 0x678);
+  //assert(sizeof(Party) == 0x16238);
   assert(sizeof(GUIButton) == 0xBC);
   assert(sizeof(GUIWindow) == 0x54);
   assert(sizeof(GUIProgressBar) == 0x1B8);
   assert(sizeof(GUIFont) == 0x1020);
   assert(sizeof(stru262_TurnBased) == 0x40);
-  assert(sizeof(ArcomageGame) == 0xFA);
+  //assert(sizeof(ArcomageGame) == 0xFA);
   assert(sizeof(stru277) == 0x14);
   assert(sizeof(ArcomageCard) == 0x6C);
   assert(sizeof(stru320) == 0x3FC);
diff -r 6e4619fb5808 -r ec3546510fa1 mm7_5.cpp
--- a/mm7_5.cpp	Sun Mar 03 13:38:12 2013 +0400
+++ b/mm7_5.cpp	Sun Mar 03 15:57:58 2013 +0600
@@ -15518,10 +15518,7 @@
         {
           if ( (signed int)v10 < 53 )
           {
-
-
               pParty->field_3C._shop_ban_times[(signed int)v10] = 0;
- 
           }
           continue;
         }