changeset 2503:502246699451

for MVS 2010
author Ritor1
date Fri, 19 Sep 2014 09:41:00 +0600
parents a77c34acdbc9
children 6b8c2f8c7fad
files Build/Visual Studio 2010/World of Might and Magic.vcxproj Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters
diffstat 2 files changed, 605 insertions(+), 551 deletions(-) [+]
line wrap: on
line diff
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Fri Sep 19 05:13:32 2014 +0600
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj	Fri Sep 19 09:41:00 2014 +0600
@@ -86,15 +86,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Actor.cpp" />
-    <ClCompile Include="..\..\AIL.cpp" />
     <ClCompile Include="..\..\Arcomage\Arcomage.cpp" />
     <ClCompile Include="..\..\Arcomage\ArcomageCards.cpp" />
-    <ClCompile Include="..\..\AudioPlayer.cpp" />
-    <ClCompile Include="..\..\Bink_Smacker.cpp" />
-    <ClCompile Include="..\..\CastSpellInfo.cpp" />
-    <ClCompile Include="..\..\Chest.cpp" />
-    <ClCompile Include="..\..\Conditions.cpp" />
+    <ClCompile Include="..\..\Engine\Conditions.cpp" />
+    <ClCompile Include="..\..\Engine\Events.cpp" />
+    <ClCompile Include="..\..\Engine\Game.cpp" />
     <ClCompile Include="..\..\Engine\Graphics\BSPModel.cpp" />
     <ClCompile Include="..\..\Engine\Graphics\DecalBuilder.cpp" />
     <ClCompile Include="..\..\Engine\Graphics\DecorationList.cpp" />
@@ -117,17 +113,67 @@
     <ClCompile Include="..\..\Engine\Graphics\Viewport.cpp" />
     <ClCompile Include="..\..\Engine\Graphics\Vis.cpp" />
     <ClCompile Include="..\..\Engine\Graphics\Weather.cpp" />
-    <ClCompile Include="..\..\Events.cpp" />
-    <ClCompile Include="..\..\FactionTable.cpp" />
-    <ClCompile Include="..\..\FrameTableInc.cpp" />
-    <ClCompile Include="..\..\Game.cpp" />
-    <ClCompile Include="..\..\GUIButton.cpp" />
-    <ClCompile Include="..\..\GUIFont.cpp" />
-    <ClCompile Include="..\..\GUIProgressBar.cpp" />
-    <ClCompile Include="..\..\GUIWindow.cpp" />
-    <ClCompile Include="..\..\IconFrameTable.cpp" />
-    <ClCompile Include="..\..\Items.cpp" />
-    <ClCompile Include="..\..\Keyboard.cpp" />
+    <ClCompile Include="..\..\Engine\LOD.cpp" />
+    <ClCompile Include="..\..\Engine\Log.cpp" />
+    <ClCompile Include="..\..\Engine\LuaVM.cpp" />
+    <ClCompile Include="..\..\Engine\MapInfo.cpp" />
+    <ClCompile Include="..\..\Engine\mm7text_ru.cpp" />
+    <ClCompile Include="..\..\Engine\mm7_7.cpp" />
+    <ClCompile Include="..\..\Engine\mm7_data.cpp" />
+    <ClCompile Include="..\..\Engine\MMT.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\Actor.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\Chest.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\Items.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\Monsters.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\NPC.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\ObjectList.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\Player.cpp" />
+    <ClCompile Include="..\..\Engine\Objects\SpriteObject.cpp" />
+    <ClCompile Include="..\..\Engine\OurMath.cpp" />
+    <ClCompile Include="..\..\Engine\Party.cpp" />
+    <ClCompile Include="..\..\Engine\Random.cpp" />
+    <ClCompile Include="..\..\Engine\Registry.cpp" />
+    <ClCompile Include="..\..\Engine\SaveLoad.cpp" />
+    <ClCompile Include="..\..\Engine\Spells\CastSpellInfo.cpp" />
+    <ClCompile Include="..\..\Engine\Spells\Spells.cpp" />
+    <ClCompile Include="..\..\Engine\stru298.cpp" />
+    <ClCompile Include="..\..\Engine\Tables\FactionTable.cpp" />
+    <ClCompile Include="..\..\Engine\Tables\FrameTableInc.cpp" />
+    <ClCompile Include="..\..\Engine\Tables\IconFrameTable.cpp" />
+    <ClCompile Include="..\..\Engine\Tables\PlayerFrameTable.cpp" />
+    <ClCompile Include="..\..\Engine\Tables\StorylineTextTable.cpp" />
+    <ClCompile Include="..\..\Engine\Tables\TileTable.cpp" />
+    <ClCompile Include="..\..\Engine\texts.cpp" />
+    <ClCompile Include="..\..\Engine\Timer.cpp" />
+    <ClCompile Include="..\..\Engine\TurnEngine\TurnEngine.cpp" />
+    <ClCompile Include="..\..\Engine\VectorTypes.cpp" />
+    <ClCompile Include="..\..\Engine\ZlibWrapper.cpp" />
+    <ClCompile Include="..\..\GUI\GUIButton.cpp" />
+    <ClCompile Include="..\..\GUI\GUIFont.cpp" />
+    <ClCompile Include="..\..\GUI\GUIProgressBar.cpp" />
+    <ClCompile Include="..\..\GUI\GUIWindow.cpp" />
+    <ClCompile Include="..\..\GUI\NewUI\Core\UIControlModule_wrap.cxx" />
+    <ClCompile Include="..\..\GUI\NewUI\MainMenu.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Books\UIMapBook.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Books\UINotesBooks.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Books\UISpellBook.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIArena.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIBooks.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UICharacter.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UiGame.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIGuilds.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIHouses.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIMainMenu.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIMsgProc.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIOptions.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIPartyCreation.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIPopup.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIRest.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UISaveLoad.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIShops.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UITransition.cpp" />
+    <ClCompile Include="..\..\IO\Keyboard.cpp" />
+    <ClCompile Include="..\..\IO\Mouse.cpp" />
     <ClCompile Include="..\..\lib\libpng\png.c" />
     <ClCompile Include="..\..\lib\libpng\pngerror.c" />
     <ClCompile Include="..\..\lib\libpng\pngget.c" />
@@ -189,75 +235,27 @@
     <ClCompile Include="..\..\lib\zlib\trees.c" />
     <ClCompile Include="..\..\lib\zlib\uncompr.c" />
     <ClCompile Include="..\..\lib\zlib\zutil.c" />
-    <ClCompile Include="..\..\LOD.cpp" />
-    <ClCompile Include="..\..\Log.cpp" />
-    <ClCompile Include="..\..\LuaVM.cpp" />
-    <ClCompile Include="..\..\MapInfo.cpp" />
-    <ClCompile Include="..\..\MediaPlayer.cpp" />
-    <ClCompile Include="..\..\mm7text_ru.cpp" />
-    <ClCompile Include="..\..\mm7_7.cpp" />
-    <ClCompile Include="..\..\mm7_data.cpp" />
-    <ClCompile Include="..\..\MMT.cpp" />
-    <ClCompile Include="..\..\Monsters.cpp" />
-    <ClCompile Include="..\..\Mouse.cpp" />
-    <ClCompile Include="..\..\NewUI\Core\UIControlModule_wrap.cxx" />
-    <ClCompile Include="..\..\NewUI\MainMenu.cpp" />
-    <ClCompile Include="..\..\NPC.cpp" />
-    <ClCompile Include="..\..\ObjectList.cpp" />
+    <ClCompile Include="..\..\Media\Audio\AIL.cpp" />
+    <ClCompile Include="..\..\Media\Audio\AudioPlayer.cpp" />
+    <ClCompile Include="..\..\Media\MediaPlayer.cpp" />
+    <ClCompile Include="..\..\Media\Video\Bink_Smacker.cpp" />
     <ClCompile Include="..\..\OSAPI.cpp" />
     <ClCompile Include="..\..\OSWindow.cpp" />
-    <ClCompile Include="..\..\OurMath.cpp" />
-    <ClCompile Include="..\..\Party.cpp" />
-    <ClCompile Include="..\..\Player.cpp" />
-    <ClCompile Include="..\..\PlayerFrameTable.cpp" />
     <ClCompile Include="..\..\Player_wrap.cxx">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\Random.cpp" />
-    <ClCompile Include="..\..\Registry.cpp" />
-    <ClCompile Include="..\..\SaveLoad.cpp" />
-    <ClCompile Include="..\..\Spells.cpp" />
-    <ClCompile Include="..\..\SpriteObject.cpp" />
-    <ClCompile Include="..\..\StorylineTextTable.cpp" />
-    <ClCompile Include="..\..\stru298.cpp" />
     <ClCompile Include="..\..\stru6.cpp" />
-    <ClCompile Include="..\..\texts.cpp" />
-    <ClCompile Include="..\..\TileTable.cpp" />
-    <ClCompile Include="..\..\Timer.cpp" />
-    <ClCompile Include="..\..\TurnEngine.cpp" />
-    <ClCompile Include="..\..\UI\Books\UIMapBook.cpp" />
-    <ClCompile Include="..\..\UI\Books\UINotesBooks.cpp" />
-    <ClCompile Include="..\..\UI\Books\UISpellBook.cpp" />
-    <ClCompile Include="..\..\UI\UIArena.cpp" />
-    <ClCompile Include="..\..\UI\UIBooks.cpp" />
-    <ClCompile Include="..\..\UI\UICharacter.cpp" />
-    <ClCompile Include="..\..\UI\UiGame.cpp" />
-    <ClCompile Include="..\..\UI\UIGuilds.cpp" />
-    <ClCompile Include="..\..\UI\UIHouses.cpp" />
-    <ClCompile Include="..\..\UI\UIMainMenu.cpp" />
-    <ClCompile Include="..\..\UI\UIMsgProc.cpp" />
-    <ClCompile Include="..\..\UI\UIOptions.cpp" />
-    <ClCompile Include="..\..\UI\UIPartyCreation.cpp" />
-    <ClCompile Include="..\..\UI\UIPopup.cpp" />
-    <ClCompile Include="..\..\UI\UIRest.cpp" />
-    <ClCompile Include="..\..\UI\UISaveLoad.cpp" />
-    <ClCompile Include="..\..\UI\UIShops.cpp" />
-    <ClCompile Include="..\..\UI\UITransition.cpp" />
-    <ClCompile Include="..\..\VectorTypes.cpp" />
-    <ClCompile Include="..\..\ZlibWrapper.cpp" />
     <ClCompile Include="..\..\_deleted.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Actor.h" />
-    <ClInclude Include="..\..\AIL.h" />
     <ClInclude Include="..\..\Arcomage\Arcomage.h" />
-    <ClInclude Include="..\..\AudioPlayer.h" />
-    <ClInclude Include="..\..\Autonotes.h" />
-    <ClInclude Include="..\..\Awards.h" />
-    <ClInclude Include="..\..\Bink_Smacker.h" />
-    <ClInclude Include="..\..\CastSpellInfo.h" />
-    <ClInclude Include="..\..\Chest.h" />
-    <ClInclude Include="..\..\Conditions.h" />
+    <ClInclude Include="..\..\Engine\Autonotes.h" />
+    <ClInclude Include="..\..\Engine\Awards.h" />
+    <ClInclude Include="..\..\Engine\Conditions.h" />
+    <ClInclude Include="..\..\Engine\ErrorHandling.h" />
+    <ClInclude Include="..\..\Engine\Events.h" />
+    <ClInclude Include="..\..\Engine\Events2D.h" />
+    <ClInclude Include="..\..\Engine\Game.h" />
     <ClInclude Include="..\..\Engine\Graphics\BSPModel.h" />
     <ClInclude Include="..\..\Engine\Graphics\DecalBuilder.h" />
     <ClInclude Include="..\..\Engine\Graphics\DecorationList.h" />
@@ -282,19 +280,75 @@
     <ClInclude Include="..\..\Engine\Graphics\Viewport.h" />
     <ClInclude Include="..\..\Engine\Graphics\Vis.h" />
     <ClInclude Include="..\..\Engine\Graphics\Weather.h" />
-    <ClInclude Include="..\..\ErrorHandling.h" />
-    <ClInclude Include="..\..\Events.h" />
-    <ClInclude Include="..\..\Events2D.h" />
-    <ClInclude Include="..\..\FactionTable.h" />
-    <ClInclude Include="..\..\FrameTableInc.h" />
-    <ClInclude Include="..\..\Game.h" />
-    <ClInclude Include="..\..\GUIButton.h" />
-    <ClInclude Include="..\..\GUIFont.h" />
-    <ClInclude Include="..\..\GUIProgressBar.h" />
-    <ClInclude Include="..\..\GUIWindow.h" />
-    <ClInclude Include="..\..\IconFrameTable.h" />
-    <ClInclude Include="..\..\Items.h" />
-    <ClInclude Include="..\..\Keyboard.h" />
+    <ClInclude Include="..\..\Engine\LOD.h" />
+    <ClInclude Include="..\..\Engine\Log.h" />
+    <ClInclude Include="..\..\Engine\LuaVM.h" />
+    <ClInclude Include="..\..\Engine\MapInfo.h" />
+    <ClInclude Include="..\..\Engine\MapsLongTimer.h" />
+    <ClInclude Include="..\..\Engine\MM7.h" />
+    <ClInclude Include="..\..\Engine\mm7_data.h" />
+    <ClInclude Include="..\..\Engine\MMT.h" />
+    <ClInclude Include="..\..\Engine\NZIArray.h" />
+    <ClInclude Include="..\..\Engine\Objects\Actor.h" />
+    <ClInclude Include="..\..\Engine\Objects\Chest.h" />
+    <ClInclude Include="..\..\Engine\Objects\Items.h" />
+    <ClInclude Include="..\..\Engine\Objects\Monsters.h" />
+    <ClInclude Include="..\..\Engine\Objects\NPC.h" />
+    <ClInclude Include="..\..\Engine\Objects\ObjectList.h" />
+    <ClInclude Include="..\..\Engine\Objects\Player.h" />
+    <ClInclude Include="..\..\Engine\Objects\SpriteObject.h" />
+    <ClInclude Include="..\..\Engine\OurMath.h" />
+    <ClInclude Include="..\..\Engine\Party.h" />
+    <ClInclude Include="..\..\Engine\Random.h" />
+    <ClInclude Include="..\..\Engine\Registry.h" />
+    <ClInclude Include="..\..\Engine\resource.h" />
+    <ClInclude Include="..\..\Engine\SaveLoad.h" />
+    <ClInclude Include="..\..\Engine\Spells\CastSpellInfo.h" />
+    <ClInclude Include="..\..\Engine\Spells\Spells.h" />
+    <ClInclude Include="..\..\Engine\stru123.h" />
+    <ClInclude Include="..\..\Engine\stru159.h" />
+    <ClInclude Include="..\..\Engine\stru160.h" />
+    <ClInclude Include="..\..\Engine\stru298.h" />
+    <ClInclude Include="..\..\Engine\stru314.h" />
+    <ClInclude Include="..\..\Engine\stru367.h" />
+    <ClInclude Include="..\..\Engine\stuff.h" />
+    <ClInclude Include="..\..\Engine\Tables\FactionTable.h" />
+    <ClInclude Include="..\..\Engine\Tables\FrameTableInc.h" />
+    <ClInclude Include="..\..\Engine\Tables\IconFrameTable.h" />
+    <ClInclude Include="..\..\Engine\Tables\PlayerFrameTable.h" />
+    <ClInclude Include="..\..\Engine\Tables\StorylineTextTable.h" />
+    <ClInclude Include="..\..\Engine\Tables\TileFrameTable.h" />
+    <ClInclude Include="..\..\Engine\texts.h" />
+    <ClInclude Include="..\..\Engine\Timer.h" />
+    <ClInclude Include="..\..\Engine\TurnEngine\TurnEngine.h" />
+    <ClInclude Include="..\..\Engine\VectorTypes.h" />
+    <ClInclude Include="..\..\Engine\ZlibWrapper.h" />
+    <ClInclude Include="..\..\GUI\GUIButton.h" />
+    <ClInclude Include="..\..\GUI\GUIFont.h" />
+    <ClInclude Include="..\..\GUI\GUIProgressBar.h" />
+    <ClInclude Include="..\..\GUI\GUIWindow.h" />
+    <ClInclude Include="..\..\GUI\NewUI\Core\UIControl.h" />
+    <ClInclude Include="..\..\GUI\NewUI\MainMenu.h" />
+    <ClInclude Include="..\..\GUI\UI\Books\UIMapBook.h" />
+    <ClInclude Include="..\..\GUI\UI\Books\UINotesBooks.h" />
+    <ClInclude Include="..\..\GUI\UI\Books\UISpellBook.h" />
+    <ClInclude Include="..\..\GUI\UI\UIArena.h" />
+    <ClInclude Include="..\..\GUI\UI\UIBooks.h" />
+    <ClInclude Include="..\..\GUI\UI\UICharacter.h" />
+    <ClInclude Include="..\..\GUI\UI\UIGame.h" />
+    <ClInclude Include="..\..\GUI\UI\UIGuilds.h" />
+    <ClInclude Include="..\..\GUI\UI\UIHouses.h" />
+    <ClInclude Include="..\..\GUI\UI\UIMainMenu.h" />
+    <ClInclude Include="..\..\GUI\UI\UIMsgProc.h" />
+    <ClInclude Include="..\..\GUI\UI\UIOptions.h" />
+    <ClInclude Include="..\..\GUI\UI\UIPartyCreation.h" />
+    <ClInclude Include="..\..\GUI\UI\UIPopup.h" />
+    <ClInclude Include="..\..\GUI\UI\UIRest.h" />
+    <ClInclude Include="..\..\GUI\UI\UISaveLoad.h" />
+    <ClInclude Include="..\..\GUI\UI\UIShops.h" />
+    <ClInclude Include="..\..\GUI\UI\UITransition.h" />
+    <ClInclude Include="..\..\IO\Keyboard.h" />
+    <ClInclude Include="..\..\IO\Mouse.h" />
     <ClInclude Include="..\..\lib\legacy_dx\d3d.h" />
     <ClInclude Include="..\..\lib\legacy_dx\d3dcaps.h" />
     <ClInclude Include="..\..\lib\legacy_dx\d3drm.h" />
@@ -436,57 +490,21 @@
     <ClInclude Include="..\..\lib\zlib\zconf.h" />
     <ClInclude Include="..\..\lib\zlib\zlib.h" />
     <ClInclude Include="..\..\lib\zlib\zutil.h" />
-    <ClInclude Include="..\..\LOD.h" />
-    <ClInclude Include="..\..\Log.h" />
-    <ClInclude Include="..\..\LuaVM.h" />
-    <ClInclude Include="..\..\MapInfo.h" />
-    <ClInclude Include="..\..\MediaPlayer.h" />
-    <ClInclude Include="..\..\MM7.h" />
-    <ClInclude Include="..\..\mm7_data.h" />
+    <ClInclude Include="..\..\Media\Audio\AIL.h" />
+    <ClInclude Include="..\..\Media\Audio\AudioPlayer.h" />
+    <ClInclude Include="..\..\Media\Audio\OpenALSoundProvider.h" />
+    <ClInclude Include="..\..\Media\MediaPlayer.h" />
+    <ClInclude Include="..\..\Media\Video\Bink_Smacker.h" />
     <ClInclude Include="..\..\mm7_unsorted_subs.h" />
-    <ClInclude Include="..\..\MMT.h" />
-    <ClInclude Include="..\..\Monsters.h" />
-    <ClInclude Include="..\..\Mouse.h" />
-    <ClInclude Include="..\..\NewUI\Core\UIControl.h" />
-    <ClInclude Include="..\..\NewUI\MainMenu.h" />
-    <ClInclude Include="..\..\NPC.h" />
-    <ClInclude Include="..\..\NZIArray.h" />
-    <ClInclude Include="..\..\ObjectList.h" />
-    <ClInclude Include="..\..\OpenALSoundProvider.h" />
     <ClInclude Include="..\..\OSAPI.h" />
     <ClInclude Include="..\..\OSInfo.h" />
     <ClInclude Include="..\..\OSWindow.h" />
-    <ClInclude Include="..\..\OurMath.h" />
     <ClInclude Include="..\..\Outdoor_stuff.h" />
-    <ClInclude Include="..\..\Party.h" />
-    <ClInclude Include="..\..\Player.h" />
-    <ClInclude Include="..\..\PlayerFrameTable.h" />
-    <ClInclude Include="..\..\Random.h" />
-    <ClInclude Include="..\..\Registry.h" />
-    <ClInclude Include="..\..\resource.h" />
-    <ClInclude Include="..\..\SaveLoad.h" />
-    <ClInclude Include="..\..\Spells.h" />
-    <ClInclude Include="..\..\SpriteObject.h" />
-    <ClInclude Include="..\..\StorylineTextTable.h" />
-    <ClInclude Include="..\..\stru123.h" />
-    <ClInclude Include="..\..\stru159.h" />
-    <ClInclude Include="..\..\stru160.h" />
-    <ClInclude Include="..\..\stru298.h" />
-    <ClInclude Include="..\..\stru314.h" />
-    <ClInclude Include="..\..\stru367.h" />
     <ClInclude Include="..\..\stru6.h" />
-    <ClInclude Include="..\..\stuff.h" />
-    <ClInclude Include="..\..\texts.h" />
-    <ClInclude Include="..\..\TileFrameTable.h" />
-    <ClInclude Include="..\..\Timer.h" />
-    <ClInclude Include="..\..\TurnEngine.h" />
-    <ClInclude Include="..\..\UI\UIArena.h" />
-    <ClInclude Include="..\..\UI\UIBooks.h" />
-    <ClInclude Include="..\..\UI\UIHouses.h" />
-    <ClInclude Include="..\..\VectorTypes.h" />
-    <ClInclude Include="..\..\ZlibWrapper.h" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\..\Engine\Objects\Player.swig" />
+    <None Include="..\..\GUI\NewUI\Core\UIControlModule.swig" />
     <None Include="..\..\lib\legacy_dx\d3dvec.inl" />
     <None Include="..\..\lib\OpenAL\lib\x86\avcodec-55.def" />
     <None Include="..\..\lib\OpenAL\lib\x86\avdevice-55.def" />
@@ -497,13 +515,6 @@
     <None Include="..\..\lib\OpenAL\lib\x86\swresample-0.def" />
     <None Include="..\..\lib\OpenAL\lib\x86\swscale-2.def" />
     <None Include="..\..\lib\swig.bat" />
-    <CustomBuild Include="..\..\NewUI\Core\UIControlModule.swig">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">call "../../lib/swig" "%(FileName)" %(RelativeDir) "%(FileName)%(Extension)" "%(FullPath)" "$(SolutionDir)" %(Filename)_wrap.cxx</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename)_wrap.cxx</Outputs>
-    </CustomBuild>
-    <None Include="..\..\lib\swig\swigwin-2.0.11\UIControlModule.swig" />
-    <None Include="..\..\Player.swig" />
     <None Include="..\..\README.md" />
   </ItemGroup>
   <ItemGroup>
--- a/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Fri Sep 19 05:13:32 2014 +0600
+++ b/Build/Visual Studio 2010/World of Might and Magic.vcxproj.filters	Fri Sep 19 09:41:00 2014 +0600
@@ -291,213 +291,6 @@
     <ClCompile Include="..\..\_deleted.cpp" />
     <ClCompile Include="..\..\OSAPI.cpp" />
     <ClCompile Include="..\..\OSWindow.cpp" />
-    <ClCompile Include="..\..\TurnEngine.cpp">
-      <Filter>Engine\TurnEngine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\FactionTable.cpp">
-      <Filter>Engine\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\FrameTableInc.cpp">
-      <Filter>Engine\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\IconFrameTable.cpp">
-      <Filter>Engine\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\PlayerFrameTable.cpp">
-      <Filter>Engine\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\StorylineTextTable.cpp">
-      <Filter>Engine\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\TileTable.cpp">
-      <Filter>Engine\Tables</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\CastSpellInfo.cpp">
-      <Filter>Engine\Spells</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Spells.cpp">
-      <Filter>Engine\Spells</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Actor.cpp">
-      <Filter>Engine\Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Chest.cpp">
-      <Filter>Engine\Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Items.cpp">
-      <Filter>Engine\Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Monsters.cpp">
-      <Filter>Engine\Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\NPC.cpp">
-      <Filter>Engine\Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ObjectList.cpp">
-      <Filter>Engine\Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Player.cpp">
-      <Filter>Engine\Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\SpriteObject.cpp">
-      <Filter>Engine\Objects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Conditions.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Events.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Game.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\LOD.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Log.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\LuaVM.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\MapInfo.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mm7_7.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mm7_data.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\mm7text_ru.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\MMT.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\OurMath.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Party.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Random.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Registry.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\SaveLoad.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\stru298.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\stru6.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\texts.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Timer.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\VectorTypes.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\ZlibWrapper.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Keyboard.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Mouse.cpp">
-      <Filter>IO</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\AIL.cpp">
-      <Filter>Media\Audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\AudioPlayer.cpp">
-      <Filter>Media\Audio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Bink_Smacker.cpp">
-      <Filter>Media\Video</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\MediaPlayer.cpp">
-      <Filter>Media</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\GUIButton.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\GUIFont.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\GUIProgressBar.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\GUIWindow.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\NewUI\MainMenu.cpp">
-      <Filter>GUI\NewUI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\NewUI\Core\UIControlModule_wrap.cxx">
-      <Filter>GUI\NewUI\Core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIArena.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIBooks.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UICharacter.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UiGame.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIGuilds.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIHouses.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIMainMenu.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIMsgProc.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIOptions.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIPartyCreation.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIPopup.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIRest.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UISaveLoad.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UIShops.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\UITransition.cpp">
-      <Filter>GUI\UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\Books\UIMapBook.cpp">
-      <Filter>GUI\UI\Books</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\Books\UINotesBooks.cpp">
-      <Filter>GUI\UI\Books</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\UI\Books\UISpellBook.cpp">
-      <Filter>GUI\UI\Books</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Player_wrap.cxx" />
     <ClCompile Include="..\..\Arcomage\Arcomage.cpp">
       <Filter>Arcomage</Filter>
@@ -571,6 +364,211 @@
     <ClCompile Include="..\..\Engine\Graphics\RenderD3D11.cpp">
       <Filter>Engine\Graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Engine\Objects\Monsters.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Objects\NPC.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Objects\ObjectList.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Objects\Player.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Objects\SpriteObject.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Objects\Actor.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Objects\Chest.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Objects\Items.cpp">
+      <Filter>Engine\Objects</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Spells\Spells.cpp">
+      <Filter>Engine\Spells</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Spells\CastSpellInfo.cpp">
+      <Filter>Engine\Spells</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Tables\FrameTableInc.cpp">
+      <Filter>Engine\Tables</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Tables\IconFrameTable.cpp">
+      <Filter>Engine\Tables</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Tables\PlayerFrameTable.cpp">
+      <Filter>Engine\Tables</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Tables\StorylineTextTable.cpp">
+      <Filter>Engine\Tables</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Tables\TileTable.cpp">
+      <Filter>Engine\Tables</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Tables\FactionTable.cpp">
+      <Filter>Engine\Tables</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\TurnEngine\TurnEngine.cpp">
+      <Filter>Engine\TurnEngine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\ZlibWrapper.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Conditions.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Events.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Game.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\LOD.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Log.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\LuaVM.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\MapInfo.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\mm7_7.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\mm7_data.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\mm7text_ru.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\MMT.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\OurMath.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Party.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Random.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Registry.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\SaveLoad.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\stru298.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\texts.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\Timer.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Engine\VectorTypes.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\NewUI\Core\UIControlModule_wrap.cxx">
+      <Filter>GUI\NewUI\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\NewUI\MainMenu.cpp">
+      <Filter>GUI\NewUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\Books\UINotesBooks.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\Books\UISpellBook.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\Books\UIMapBook.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIPopup.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIRest.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UISaveLoad.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIShops.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UITransition.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIArena.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIBooks.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UICharacter.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UiGame.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIGuilds.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIHouses.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIMainMenu.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIMsgProc.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIOptions.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIPartyCreation.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\GUIProgressBar.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\GUIWindow.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\GUIButton.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\GUIFont.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\IO\Mouse.cpp">
+      <Filter>IO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\IO\Keyboard.cpp">
+      <Filter>IO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Media\Audio\AudioPlayer.cpp">
+      <Filter>Media\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Media\Audio\AIL.cpp">
+      <Filter>Media\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Media\Video\Bink_Smacker.cpp">
+      <Filter>Media\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Media\MediaPlayer.cpp">
+      <Filter>Media</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\stru6.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\lib\libavcodec\avcodec.h">
@@ -999,204 +997,6 @@
     <ClInclude Include="..\..\OSAPI.h" />
     <ClInclude Include="..\..\OSInfo.h" />
     <ClInclude Include="..\..\OSWindow.h" />
-    <ClInclude Include="..\..\TurnEngine.h">
-      <Filter>Engine\TurnEngine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FactionTable.h">
-      <Filter>Engine\Tables</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FrameTableInc.h">
-      <Filter>Engine\Tables</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\IconFrameTable.h">
-      <Filter>Engine\Tables</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\PlayerFrameTable.h">
-      <Filter>Engine\Tables</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\StorylineTextTable.h">
-      <Filter>Engine\Tables</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\TileFrameTable.h">
-      <Filter>Engine\Tables</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\CastSpellInfo.h">
-      <Filter>Engine\Spells</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Spells.h">
-      <Filter>Engine\Spells</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Actor.h">
-      <Filter>Engine\Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Chest.h">
-      <Filter>Engine\Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Items.h">
-      <Filter>Engine\Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Monsters.h">
-      <Filter>Engine\Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\NPC.h">
-      <Filter>Engine\Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ObjectList.h">
-      <Filter>Engine\Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Player.h">
-      <Filter>Engine\Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\SpriteObject.h">
-      <Filter>Engine\Objects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Autonotes.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Awards.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Conditions.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ErrorHandling.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Events.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Events2D.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Game.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\LOD.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Log.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\LuaVM.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\MapInfo.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\MM7.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\mm7_data.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\MMT.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\NZIArray.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\OurMath.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Party.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Random.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Registry.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\resource.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\SaveLoad.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\stru123.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\stru159.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\stru160.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\stru298.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\stru314.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\stru367.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\stru6.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\stuff.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\texts.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Timer.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\VectorTypes.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ZlibWrapper.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Keyboard.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Mouse.h">
-      <Filter>IO</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\AIL.h">
-      <Filter>Media\Audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\AudioPlayer.h">
-      <Filter>Media\Audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\OpenALSoundProvider.h">
-      <Filter>Media\Audio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Bink_Smacker.h">
-      <Filter>Media\Video</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\MediaPlayer.h">
-      <Filter>Media</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\GUIButton.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\GUIFont.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\GUIProgressBar.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\GUIWindow.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\NewUI\MainMenu.h">
-      <Filter>GUI\NewUI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\NewUI\Core\UIControl.h">
-      <Filter>GUI\NewUI\Core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\UI\UIArena.h">
-      <Filter>GUI\UI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\UI\UIBooks.h">
-      <Filter>GUI\UI</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\UI\UIHouses.h">
-      <Filter>GUI\UI</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\mm7_unsorted_subs.h" />
     <ClInclude Include="..\..\Outdoor_stuff.h" />
     <ClInclude Include="..\..\Arcomage\Arcomage.h">
@@ -1274,6 +1074,250 @@
     <ClInclude Include="..\..\Engine\Graphics\Weather.h">
       <Filter>Engine\Graphics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Engine\Objects\Monsters.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Objects\NPC.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Objects\ObjectList.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Objects\Player.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Objects\SpriteObject.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Objects\Actor.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Objects\Chest.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Objects\Items.h">
+      <Filter>Engine\Objects</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Spells\CastSpellInfo.h">
+      <Filter>Engine\Spells</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Spells\Spells.h">
+      <Filter>Engine\Spells</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Tables\FrameTableInc.h">
+      <Filter>Engine\Tables</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Tables\IconFrameTable.h">
+      <Filter>Engine\Tables</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Tables\PlayerFrameTable.h">
+      <Filter>Engine\Tables</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Tables\StorylineTextTable.h">
+      <Filter>Engine\Tables</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Tables\TileFrameTable.h">
+      <Filter>Engine\Tables</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Tables\FactionTable.h">
+      <Filter>Engine\Tables</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\TurnEngine\TurnEngine.h">
+      <Filter>Engine\TurnEngine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\VectorTypes.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\ZlibWrapper.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Autonotes.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Awards.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Conditions.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\ErrorHandling.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Events2D.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Events.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Game.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\LOD.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Log.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\LuaVM.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\MapInfo.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\MapsLongTimer.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\MM7.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\mm7_data.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\MMT.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\NZIArray.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\OurMath.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Party.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Random.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Registry.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\resource.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\SaveLoad.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\stru123.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\stru159.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\stru160.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\stru298.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\stru314.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\stru367.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\stuff.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\texts.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Engine\Timer.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\NewUI\Core\UIControl.h">
+      <Filter>GUI\NewUI\Core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\NewUI\MainMenu.h">
+      <Filter>GUI\NewUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\Books\UINotesBooks.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\Books\UISpellBook.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\Books\UIMapBook.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIPopup.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIRest.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UISaveLoad.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIShops.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UITransition.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIArena.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIBooks.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UICharacter.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIGame.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIGuilds.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIHouses.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIMainMenu.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIMsgProc.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIOptions.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIPartyCreation.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\GUIProgressBar.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\GUIWindow.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\GUIButton.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\GUIFont.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\IO\Keyboard.h">
+      <Filter>IO</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\IO\Mouse.h">
+      <Filter>IO</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Media\Audio\AIL.h">
+      <Filter>Media\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Media\Audio\AudioPlayer.h">
+      <Filter>Media\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Media\Audio\OpenALSoundProvider.h">
+      <Filter>Media\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Media\Video\Bink_Smacker.h">
+      <Filter>Media\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Media\MediaPlayer.h">
+      <Filter>Media</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stru6.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\lib\OpenAL\lib\x86\avcodec-55.def">
@@ -1306,11 +1350,13 @@
     <None Include="..\..\lib\swig.bat">
       <Filter>lib</Filter>
     </None>
-    <None Include="..\..\Player.swig">
+    <None Include="..\..\README.md" />
+    <None Include="..\..\Engine\Objects\Player.swig">
       <Filter>Engine\Objects</Filter>
     </None>
-    <None Include="..\..\lib\swig\swigwin-2.0.11\UIControlModule.swig" />
-    <None Include="..\..\README.md" />
+    <None Include="..\..\GUI\NewUI\Core\UIControlModule.swig">
+      <Filter>GUI\NewUI\Core</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\..\lib\OpenAL\lib\OpenAL\OpenAL32.lib">
@@ -1341,7 +1387,4 @@
       <Filter>lib\OpenAL\lib\x86</Filter>
     </Library>
   </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\NewUI\Core\UIControlModule.swig" />
-  </ItemGroup>
 </Project>
\ No newline at end of file