# HG changeset patch
# User Ritor1
# Date 1431526152 -21600
# Node ID 5d6fb8eb023c065ef2c6c5551b71b6f275270588
# Parent  bbef1435eb8d2c764110ead70d8046f9a247e043# Parent  f2a8ed07e921515aed74647c2681f5d5b32795d6
Слияние

diff -r f2a8ed07e921 -r 5d6fb8eb023c Build/Visual Studio 2012/World of Might and Magic.vcxproj
--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Wed May 13 11:31:58 2015 +0200
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj	Wed May 13 20:09:12 2015 +0600
@@ -93,8 +93,8 @@
     <ClCompile Include="..\..\Arcomage\Arcomage.cpp" />
     <ClCompile Include="..\..\Arcomage\ArcomageCards.cpp" />
     <ClCompile Include="..\..\Engine\Conditions.cpp" />
+    <ClCompile Include="..\..\Engine\Engine.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" />
@@ -152,15 +152,24 @@
     <ClCompile Include="..\..\Engine\TurnEngine\TurnEngine.cpp" />
     <ClCompile Include="..\..\Engine\VectorTypes.cpp" />
     <ClCompile Include="..\..\Engine\ZlibWrapper.cpp" />
+    <ClCompile Include="..\..\Game\Game.cpp" />
+    <ClCompile Include="..\..\Game\GameOver.cpp" />
+    <ClCompile Include="..\..\Game\MainMenu.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\Books\AutonotesBook.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Books\CalendarBook.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Books\JournalBook.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Books\LloydsBook.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Books\MapBook.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Books\QuestBook.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Books\TownPortalBook.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Chest.cpp" />
+    <ClCompile Include="..\..\GUI\UI\Spellbook.cpp" />
     <ClCompile Include="..\..\GUI\UI\UIArena.cpp" />
     <ClCompile Include="..\..\GUI\UI\UIBooks.cpp" />
     <ClCompile Include="..\..\GUI\UI\UICharacter.cpp" />
@@ -168,10 +177,10 @@
     <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\UIModal.cpp" />
     <ClCompile Include="..\..\GUI\UI\UIPartyCreation.cpp" />
     <ClCompile Include="..\..\GUI\UI\UIPopup.cpp" />
+    <ClCompile Include="..\..\GUI\UI\UIQuickReference.cpp" />
     <ClCompile Include="..\..\GUI\UI\UIRest.cpp" />
     <ClCompile Include="..\..\GUI\UI\UISaveLoad.cpp" />
     <ClCompile Include="..\..\GUI\UI\UIShops.cpp" />
@@ -253,10 +262,10 @@
     <ClInclude Include="..\..\Engine\Autonotes.h" />
     <ClInclude Include="..\..\Engine\Awards.h" />
     <ClInclude Include="..\..\Engine\Conditions.h" />
+    <ClInclude Include="..\..\Engine\Engine.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" />
@@ -312,7 +321,6 @@
     <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" />
@@ -324,15 +332,24 @@
     <ClInclude Include="..\..\Engine\TurnEngine\TurnEngine.h" />
     <ClInclude Include="..\..\Engine\VectorTypes.h" />
     <ClInclude Include="..\..\Engine\ZlibWrapper.h" />
+    <ClInclude Include="..\..\Game\Game.h" />
+    <ClInclude Include="..\..\Game\GameOver.h" />
+    <ClInclude Include="..\..\Game\MainMenu.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\Books\AutonotesBook.h" />
+    <ClInclude Include="..\..\GUI\UI\Books\CalendarBook.h" />
+    <ClInclude Include="..\..\GUI\UI\Books\JournalBook.h" />
+    <ClInclude Include="..\..\GUI\UI\Books\LloydsBook.h" />
+    <ClInclude Include="..\..\GUI\UI\Books\MapBook.h" />
+    <ClInclude Include="..\..\GUI\UI\Books\QuestBook.h" />
+    <ClInclude Include="..\..\GUI\UI\Books\TownPortalBook.h" />
+    <ClInclude Include="..\..\GUI\UI\Chest.h" />
+    <ClInclude Include="..\..\GUI\UI\Spellbook.h" />
     <ClInclude Include="..\..\GUI\UI\UIArena.h" />
     <ClInclude Include="..\..\GUI\UI\UIBooks.h" />
     <ClInclude Include="..\..\GUI\UI\UICharacter.h" />
@@ -340,10 +357,10 @@
     <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\UIModal.h" />
     <ClInclude Include="..\..\GUI\UI\UIPartyCreation.h" />
     <ClInclude Include="..\..\GUI\UI\UIPopup.h" />
+    <ClInclude Include="..\..\GUI\UI\UIQuickReference.h" />
     <ClInclude Include="..\..\GUI\UI\UIRest.h" />
     <ClInclude Include="..\..\GUI\UI\UISaveLoad.h" />
     <ClInclude Include="..\..\GUI\UI\UIShops.h" />
diff -r f2a8ed07e921 -r 5d6fb8eb023c Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters
--- a/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters	Wed May 13 11:31:58 2015 +0200
+++ b/Build/Visual Studio 2012/World of Might and Magic.vcxproj.filters	Wed May 13 20:09:12 2015 +0600
@@ -109,6 +109,9 @@
     <Filter Include="Engine\Graphics\Shaders">
       <UniqueIdentifier>{740b8731-e3ff-44cb-b6c8-85a64c7cbfc0}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Game">
+      <UniqueIdentifier>{6dd9bc0c-a6d9-40ea-9eb9-d0f38abd514b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\lib\zlib\adler32.c">
@@ -441,9 +444,6 @@
     <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>
@@ -490,15 +490,6 @@
     <ClCompile Include="..\..\GUI\NewUI\MainMenu.cpp">
       <Filter>GUI\NewUI</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\Books\UINotesBooks.cpp">
-      <Filter>GUI\UI\Books</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\GUI\UI\UIGuilds.cpp">
       <Filter>GUI\UI</Filter>
     </ClCompile>
@@ -508,12 +499,6 @@
     <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>
@@ -574,6 +559,51 @@
     <ClCompile Include="..\..\Media\MediaPlayer.cpp">
       <Filter>Media</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Engine\Engine.cpp">
+      <Filter>Engine</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Game\Game.cpp">
+      <Filter>Game</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Game\GameOver.cpp">
+      <Filter>Game</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Game\MainMenu.cpp">
+      <Filter>Game</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIModal.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\UIQuickReference.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\Books\AutonotesBook.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\Books\CalendarBook.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\Books\JournalBook.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\Books\LloydsBook.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\Books\MapBook.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\Books\QuestBook.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\Books\TownPortalBook.cpp">
+      <Filter>GUI\UI\Books</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\Chest.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\GUI\UI\Spellbook.cpp">
+      <Filter>GUI\UI</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\lib\libavcodec\avcodec.h">
@@ -1140,9 +1170,6 @@
     <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>
@@ -1173,9 +1200,6 @@
     <ClInclude Include="..\..\Engine\Events2D.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Engine\Game.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Engine\LOD.h">
       <Filter>Engine</Filter>
     </ClInclude>
@@ -1234,15 +1258,6 @@
     <ClInclude Include="..\..\GUI\NewUI\MainMenu.h">
       <Filter>GUI\NewUI</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\Books\UINotesBooks.h">
-      <Filter>GUI\UI\Books</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\GUI\UI\UIGame.h">
       <Filter>GUI\UI</Filter>
     </ClInclude>
@@ -1255,12 +1270,6 @@
     <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>
@@ -1321,6 +1330,51 @@
     <ClInclude Include="..\..\Media\MediaPlayer.h">
       <Filter>Media</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Engine\Engine.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Game\Game.h">
+      <Filter>Game</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Game\GameOver.h">
+      <Filter>Game</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Game\MainMenu.h">
+      <Filter>Game</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIModal.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\UIQuickReference.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\Books\AutonotesBook.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\Books\CalendarBook.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\Books\JournalBook.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\Books\LloydsBook.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\Books\MapBook.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\Books\QuestBook.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\Books\TownPortalBook.h">
+      <Filter>GUI\UI\Books</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\Chest.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\GUI\UI\Spellbook.h">
+      <Filter>GUI\UI</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\lib\OpenAL\lib\x86\avcodec-55.def">
diff -r f2a8ed07e921 -r 5d6fb8eb023c GUI/GUIWindow.cpp
--- a/GUI/GUIWindow.cpp	Wed May 13 11:31:58 2015 +0200
+++ b/GUI/GUIWindow.cpp	Wed May 13 20:09:12 2015 +0600
@@ -1246,7 +1246,7 @@
     }
 
     //GUIWindow* pWindow = &pWindowList[uNextFreeWindowID];
-    pWindowList[uNextFreeWindowID] = this;
+    pWindowList[uNextFreeWindowID] = this;//sometimes uNextFreeWindowID == 20. it's result crash
     this->uFrameWidth = uWidth;
     this->uFrameHeight = uHeight;
 
diff -r f2a8ed07e921 -r 5d6fb8eb023c Media/Audio/AudioPlayer.cpp
--- a/Media/Audio/AudioPlayer.cpp	Wed May 13 11:31:58 2015 +0200
+++ b/Media/Audio/AudioPlayer.cpp	Wed May 13 20:09:12 2015 +0600
@@ -1425,7 +1425,6 @@
   double v11; // st7@13
   SpriteObject *v12; // eax@14
   Actor *v13; // eax@15
-//  signed int v14; // edx@15
   BLVDoor *pDoor; // eax@19
   double v16; // st7@22
   double v17; // st6@22
@@ -1439,8 +1438,6 @@
   int v25; // eax@32
   float v26; // ST10_4@34
   float v27; // ST08_4@34
-//  int v38; // eax@53
-//  __int16 v51; // ax@71
   signed int v53; // eax@88
   RenderVertexSoft a1; // [sp+24h] [bp-48h]@1
   float v55; // [sp+54h] [bp-18h]@22
@@ -1449,11 +1446,7 @@
   float v58; // [sp+60h] [bp-Ch]@23
   int v59; // [sp+64h] [bp-8h]@4
 
-  //pAudioPlayer = this;
   v2 = 0;
-  //thisa = this;
-  //v3 = this->bPlayerReady == 0;
-  //a1.flt_2C = 0.0;
   if (!bPlayerReady)
     return;
   
@@ -1515,11 +1508,11 @@
                   v19 = *(float *)&uNumRepeats * v56 + v58 * v55;
                   v20 = v58 * v56 - *(float *)&uNumRepeats * v55;
                 }
-                /*else
-                {
-                  v19 = v58 * v55 - *(float *)&uNumRepeats * v56;
-                  v20 = v58 * v56 + *(float *)&uNumRepeats * v55;
-                }*/
+                //else
+               // {
+                 // v19 = v58 * v55 - *(float *)&uNumRepeats * v56;
+                 // v20 = v58 * v56 + *(float *)&uNumRepeats * v55;
+                //}
                 a1.vWorldViewPosition.x = v19 * v16 - v18 * v17;
                 a1.vWorldViewPosition.y = v20;
                 a1.vWorldViewPosition.z = v19 * v17 + v18 * v16;
@@ -1533,11 +1526,11 @@
                   a1.vWorldViewPosition.x = *(float *)&uNumRepeats * v56 + v58 * v55;
                   v21 = v58 * v56 - *(float *)&uNumRepeats * v55;
                 }
-                /*else
-                {
-                  a1.vWorldViewPosition.x = v58 * v55 - *(float *)&uNumRepeats * v56;
-                  v21 = v58 * v56 + *(float *)&uNumRepeats * v55;
-                }*/
+                //else
+                //{
+                //  a1.vWorldViewPosition.x = v58 * v55 - *(float *)&uNumRepeats * v56;
+                //  v21 = v58 * v56 + *(float *)&uNumRepeats * v55;
+                //}
                 a1.vWorldViewPosition.y = v21;
                 a1.vWorldViewPosition.z = a1.vWorldPosition.z - (double)pParty->vPosition.z;
               }
@@ -1586,11 +1579,11 @@
                   v19 = *(float *)&uNumRepeats * v56 + v58 * v55;
                   v20 = v58 * v56 - *(float *)&uNumRepeats * v55;
                 }
-                /*else
-                {
-                  v19 = v58 * v55 - *(float *)&uNumRepeats * v56;
-                  v20 = v58 * v56 + *(float *)&uNumRepeats * v55;
-                }*/
+                //else
+                //{
+                 // v19 = v58 * v55 - *(float *)&uNumRepeats * v56;
+                 // v20 = v58 * v56 + *(float *)&uNumRepeats * v55;
+                //}
                 a1.vWorldViewPosition.x = v19 * v16 - v18 * v17;
                 a1.vWorldViewPosition.y = v20;
                 a1.vWorldViewPosition.z = v19 * v17 + v18 * v16;
@@ -1604,11 +1597,11 @@
                   a1.vWorldViewPosition.x = *(float *)&uNumRepeats * v56 + v58 * v55;
                   v21 = v58 * v56 - *(float *)&uNumRepeats * v55;
                 }
-                /*else
-                {
-                  a1.vWorldViewPosition.x = v58 * v55 - *(float *)&uNumRepeats * v56;
-                  v21 = v58 * v56 + *(float *)&uNumRepeats * v55;
-                }*/
+                //else
+                //{
+                 // a1.vWorldViewPosition.x = v58 * v55 - *(float *)&uNumRepeats * v56;
+                 // v21 = v58 * v56 + *(float *)&uNumRepeats * v55;
+                //}
                 a1.vWorldViewPosition.y = v21;
                 a1.vWorldViewPosition.z = a1.vWorldPosition.z - (double)pParty->vPosition.z;
               }
@@ -1660,11 +1653,11 @@
               v19 = *(float *)&uNumRepeats * v56 + v58 * v55;
               v20 = v58 * v56 - *(float *)&uNumRepeats * v55;
             }
-            /*else
-            {
-              v19 = v58 * v55 - *(float *)&uNumRepeats * v56;
-              v20 = v58 * v56 + *(float *)&uNumRepeats * v55;
-            }*/
+            //else
+           // {
+            //  v19 = v58 * v55 - *(float *)&uNumRepeats * v56;
+           //   v20 = v58 * v56 + *(float *)&uNumRepeats * v55;
+            //}
             a1.vWorldViewPosition.x = v19 * v16 - v18 * v17;
             a1.vWorldViewPosition.y = v20;
             a1.vWorldViewPosition.z = v19 * v17 + v18 * v16;
@@ -1678,11 +1671,11 @@
               a1.vWorldViewPosition.x = *(float *)&uNumRepeats * v56 + v58 * v55;
               v21 = v58 * v56 - *(float *)&uNumRepeats * v55;
             }
-            /*else
-            {
-              a1.vWorldViewPosition.x = v58 * v55 - *(float *)&uNumRepeats * v56;
-              v21 = v58 * v56 + *(float *)&uNumRepeats * v55;
-            }*/
+            //else
+            //{
+              //a1.vWorldViewPosition.x = v58 * v55 - *(float *)&uNumRepeats * v56;
+              //v21 = v58 * v56 + *(float *)&uNumRepeats * v55;
+            //}
             a1.vWorldViewPosition.y = v21;
             a1.vWorldViewPosition.z = a1.vWorldPosition.z - (double)pParty->vPosition.z;
           }
@@ -1758,11 +1751,11 @@
               v19 = *(float *)&uNumRepeats * v56 + v58 * v55;
               v20 = v58 * v56 - *(float *)&uNumRepeats * v55;
             }
-            /*else
-            {
-              v19 = v58 * v55 - *(float *)&uNumRepeats * v56;
-              v20 = v58 * v56 + *(float *)&uNumRepeats * v55;
-            }*/
+            //else
+            //{
+             // v19 = v58 * v55 - *(float *)&uNumRepeats * v56;
+             // v20 = v58 * v56 + *(float *)&uNumRepeats * v55;
+            //}
             a1.vWorldViewPosition.x = v19 * v16 - v18 * v17;
             a1.vWorldViewPosition.y = v20;
             a1.vWorldViewPosition.z = v19 * v17 + v18 * v16;
@@ -1776,11 +1769,11 @@
               a1.vWorldViewPosition.x = *(float *)&uNumRepeats * v56 + v58 * v55;
               v21 = v58 * v56 - *(float *)&uNumRepeats * v55;
             }
-            /*else
-            {
-              a1.vWorldViewPosition.x = v58 * v55 - *(float *)&uNumRepeats * v56;
-              v21 = v58 * v56 + *(float *)&uNumRepeats * v55;
-            }*/
+            //else
+            //{
+            //  a1.vWorldViewPosition.x = v58 * v55 - *(float *)&uNumRepeats * v56;
+            //  v21 = v58 * v56 + *(float *)&uNumRepeats * v55;
+            //}
             a1.vWorldViewPosition.y = v21;
             a1.vWorldViewPosition.z = a1.vWorldPosition.z - (double)pParty->vPosition.z;
           }