# HG changeset patch
# User Ritor1
# Date 1356769100 -21600
# Node ID 10ae648c8d20121b943410e55e3c652b895fefc0
# Parent  03d52010d4337282775eef0cbacc0471be3e82d7# Parent  6109a4e23903ffdf5ea299a2b2e3f28274a9883f
Слияние

diff -r 03d52010d433 -r 10ae648c8d20 AudioPlayer.cpp
--- a/AudioPlayer.cpp	Sat Dec 29 14:18:06 2012 +0600
+++ b/AudioPlayer.cpp	Sat Dec 29 14:18:20 2012 +0600
@@ -715,7 +715,7 @@
   LODWORD(v93) = 10000;
   if ( v35 || !uSoundVolumeMultiplier || !this->hDigDriver || !eSoundID )
     return;
- /*pNum = 0;
+ pNum = 0;
   if ( (signed int)pSoundList->uNumSounds <= 0 )
   {
 LABEL_9:
@@ -732,12 +732,12 @@
         goto LABEL_9;
     }
   }
-  v92 = pNum;//38 */
-  pNum = 0;
+  /* v92 = pNum;//38 
+ pNum = 0;
   for ( pSoundID = (int *)&pSoundList->pSounds->uSoundID; *pSoundID != eSoundID; pSoundID += 30)
   {
     ++pNum;
-  }
+  }*/
   if ( !pNum )
     return;
   if ( !pAudioPlayer->b3DSoundInitialized || (v89 = 120 * pNum, !(pSoundList->pSounds[pNum].uFlags & 2)) )
diff -r 03d52010d433 -r 10ae648c8d20 Game.cpp
--- a/Game.cpp	Sat Dec 29 14:18:06 2012 +0600
+++ b/Game.cpp	Sat Dec 29 14:18:20 2012 +0600
@@ -58,12 +58,9 @@
     uFlags2 |= 2u;
   pIndoorCamera->sRotationX = pParty->sRotationX;
   pIndoorCamera->sRotationY = pParty->sRotationY;
-  pIndoorCamera->pos.x = pParty->vPosition.x
-                      - ((unsigned __int64)(stru_5C6E00->SinCos(pParty->sRotationY)
+  pIndoorCamera->pos.x = pParty->vPosition.x - ((unsigned __int64)(stru_5C6E00->SinCos(pParty->sRotationY)
                                           * (signed __int64)pParty->field_18) >> 16);
-  pIndoorCamera->pos.y = pParty->vPosition.y
-                      - ((unsigned __int64)(stru_5C6E00->SinCos(
-                                              pParty->sRotationY - stru_5C6E00->uIntegerHalfPi)
+  pIndoorCamera->pos.y = pParty->vPosition.y - ((unsigned __int64)(stru_5C6E00->SinCos(pParty->sRotationY - stru_5C6E00->uIntegerHalfPi)
                                           * (signed __int64)pParty->field_18) >> 16);
   pIndoorCamera->pos.z = pParty->vPosition.z + pParty->sEyelevel;
   pIndoorCamera->Initialize2();
@@ -153,8 +150,8 @@
   pOtherOverlayList->field_3EC = 0;
   viewparams->bRedrawGameUI = v5;
   GameUI_DrawPartySpells();
-  if (v4 || pParty->pHirelings[0].evtc || pParty->pHirelings[1].evtc )
-    DrawHiredNPCs();
+  //if (v4 || pParty->pHirelings[0].evtc || pParty->pHirelings[1].evtc ) Ritor1: it's temporarily
+    //DrawHiredNPCs();
   GameUI_DrawPortraits(v4);
   GameUI_DrawLifeManaBars();
   GameUI_DrawCharacterSelectionFrame();
@@ -327,7 +324,7 @@
         v16 = 0;
         viewparams->bRedrawGameUI = true;
       }
-      pAudioPlayer->_4AAFCF();
+      //pAudioPlayer->_4AAFCF();Ritor1: it's temporarily
       if (uGameState == 1)
         goto LABEL_96;
       if (uGameState == 2)
diff -r 03d52010d433 -r 10ae648c8d20 GameUIs.cpp
diff -r 03d52010d433 -r 10ae648c8d20 Party.cpp
--- a/Party.cpp	Sat Dec 29 14:18:06 2012 +0600
+++ b/Party.cpp	Sat Dec 29 14:18:20 2012 +0600
@@ -1088,7 +1088,7 @@
           v10 = 0;
           memset(v7 - 44, 0, 0x4Cu);
           pParty->field_709 = 0;
-          sub_44A56A();
+          //sub_44A56A();Ritor1: it's temporarily
           viewparams->bRedrawGameUI = 1;
         }
         *(int *)v7 = v10;
diff -r 03d52010d433 -r 10ae648c8d20 Player.cpp
--- a/Player.cpp	Sat Dec 29 14:18:06 2012 +0600
+++ b/Player.cpp	Sat Dec 29 14:18:20 2012 +0600
@@ -604,7 +604,7 @@
   v4 = a2;//102
   v5 = 0;
   pSoundId = 0;
-  v6 = &byte_4ED3D8[8 * v4];//byte_4ED280 &byte_4ED3D8[4 * v4]
+  v6 = &SoundSetAction[8 * v4];//byte_4ED280 &byte_4ED3D8[4 * v4]
   if ( uVoicesVolumeMultiplier )
   {
     v7 = 0;
@@ -740,7 +740,6 @@
   return v3;
 }
 
-
 //----- (0049327B) --------------------------------------------------------
 int Player::_49327B(unsigned int uClass, int a3)
 {
diff -r 03d52010d433 -r 10ae648c8d20 Render.cpp
--- a/Render.cpp	Sat Dec 29 14:18:06 2012 +0600
+++ b/Render.cpp	Sat Dec 29 14:18:20 2012 +0600
@@ -906,9 +906,9 @@
 //----- (0047F5C6) --------------------------------------------------------
 float Render::DrawBezierTerrain()
 {
-//  __debugbreak();
- // return 0;
-  
+ //__debugbreak();Ritor1: it's temporarily
+  return 0;
+  /*
   unsigned int v0; // ebx@1
   unsigned int v1; // edi@1
   unsigned int v2; // eax@1
@@ -1694,7 +1694,7 @@
   }
   result = v126;
   pOutdoorCamera->field_40 = v126;
-  return result;
+  return result;*/
 }
 // 47FFC4: inconsistent fpu stack
 // 4D864C: using guessed type char byte_4D864C;
@@ -7075,7 +7075,7 @@
   if (pRenderD3D)
   {
     pGame->draw_debug_outlines();
-    DoRenderBillboards_D3D();
+    //DoRenderBillboards_D3D(); Ritor1: it's temporarily
     pGame->pStru6Instance->RenderSpecialEffects();
     pRenderD3D->pDevice->EndScene();
   }
diff -r 03d52010d433 -r 10ae648c8d20 mm7_2.cpp
--- a/mm7_2.cpp	Sat Dec 29 14:18:06 2012 +0600
+++ b/mm7_2.cpp	Sat Dec 29 14:18:20 2012 +0600
@@ -16391,7 +16391,7 @@
       UI_CreateTravelDialogue();
     }
   }
-  UpdateActors_ODM();
+  //UpdateActors_ODM();Ritor1: it's temporarily
   _46CC4B_check_event_triggers();
 }
 
diff -r 03d52010d433 -r 10ae648c8d20 mm7_4.cpp
--- a/mm7_4.cpp	Sat Dec 29 14:18:06 2012 +0600
+++ b/mm7_4.cpp	Sat Dec 29 14:18:20 2012 +0600
@@ -6870,7 +6870,8 @@
 
         for (uint y = 0; y < 8; ++y)
           memcpy(pDst + y * Dst.lPitch / 2,
-                 pSrc + y * 640, 640 * sizeof(__int16));
+
+		  pSrc + y * 640, 640 * sizeof(__int16));
 
         for (uint y = 8; y < 352; ++y)
         {
diff -r 03d52010d433 -r 10ae648c8d20 mm7_data.cpp
--- a/mm7_data.cpp	Sat Dec 29 14:18:06 2012 +0600
+++ b/mm7_data.cpp	Sat Dec 29 14:18:20 2012 +0600
@@ -1056,7 +1056,7 @@
   "pc19lhu", "pc20lhu", "pc21lhu", "pc22lhu", "pc23lhu", "pc24lhu",
   "pc25lhu"
 };
-short byte_4ED3D8[192]=
+short SoundSetAction[192]=
 {
 	0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 37, 38, 45, 0, 0, 37, 0, 0, 47, 53, 0, 0, 0, 2, 0, 0, 25, 0, 0, 0, 0, 1, 0, 0, 47, 0,
 	0, 0, 0, 3, 0, 0, 41, 42, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 5, 0, 0, 21, 22, 23, 24, 45, 6, 0, 0, 47, 0, 0, 0, 0, 7, 0,
diff -r 03d52010d433 -r 10ae648c8d20 mm7_data.h
--- a/mm7_data.h	Sat Dec 29 14:18:06 2012 +0600
+++ b/mm7_data.h	Sat Dec 29 14:18:20 2012 +0600
@@ -980,7 +980,7 @@
 extern const char *drh_texnames_by_face[25];
 extern const char *dlh_texnames_by_face[25];
 extern const char *dlhu_texnames_by_face[25];
-extern short byte_4ED3D8[192]; // weak
+extern short SoundSetAction[192]; // weak
 extern unsigned char byte_4ED498; // weak
 extern __int16 pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[4];
 extern char byte_4ED970_skill_learn_ability_by_class_table[32][37];