Mercurial > mm7

changeset 542:8e34868c8069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 03 Mar 2013 13:32:04 +0600
parents cf5609edbc45 (diff) 214d9d47cf1f (current diff)
children 9d3d8091251b
files Chest.cpp Chest.h mm7_5.cpp
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MM7.vcxproj.filters	Sun Mar 03 01:55:57 2013 +0400
+++ b/MM7.vcxproj.filters	Sun Mar 03 13:32:04 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" />
--- a/mm7_5.cpp	Sun Mar 03 01:55:57 2013 +0400
+++ b/mm7_5.cpp	Sun Mar 03 13:32:04 2013 +0600
@@ -15518,8 +15518,6 @@
         {
           if ( (signed int)v10 < 53 )
           {
-
-
               pParty->field_3C._shop_ban_times[(signed int)v10] = 0;
  
           }