diff Chest.cpp @ 1441:b67a3e0d6fc3

Слияние
author Ritor1
date Sat, 27 Jul 2013 09:36:55 +0600
parents a72236d60edc 204cce84300b
children a8b1bbac95d4
line wrap: on
line diff
--- a/Chest.cpp	Sat Jul 27 09:36:29 2013 +0600
+++ b/Chest.cpp	Sat Jul 27 09:36:55 2013 +0600
@@ -43,44 +43,30 @@
 //----- (0042041E) --------------------------------------------------------
 bool Chest::Open( signed int uChestID )
 {
-  unsigned int v2; // eax@8
-  GUIWindow *v3; // eax@15
-  int v5; // edx@16
+  unsigned int pMapID; // eax@8
+  int pRandom; // edx@16
   int v6; // eax@16
-  ODMFace *pOdmFace; // eax@19
-  int v8; // edx@19
-  int v9; // edi@19
-  signed int v10; // ebx@19
-  int v11; // ecx@19
-  int v12; // eax@19
-  BLVFace *pBlvFace; // eax@20
-  int v14; // ebx@21
-  int v15; // edi@21
-  __int64 v17; // qax@22
-  double v18; // st7@23
-  double v19; // st6@23
-  double v20; // st7@23
-  int v21; // ecx@26
-  char v22[12]; // ST4C_12@28
-  unsigned int *v23; // edi@28
-  unsigned __int16 v24; // di@28
-  signed int v25; // ecx@28
-  char *v26; // edx@29
-  unsigned __int16 v27; // ax@32
-  int v29[4]; // [sp+84h] [bp-40h]@16
-  float v33; // [sp+94h] [bp-30h]@23
+  ODMFace *pODMFace; // eax@19
+  BLVFace *pBLVFace; // eax@20
+  int pObjectX; // ebx@21
+  int pObjectZ; // edi@21
+  double dir_x; // st7@23
+  double dir_y; // st6@23
+  double length_vector; // st7@23
+  int pDepth; // ecx@26
+  Vec3_int_ v; // ST4C_12@28
+  bool flag_shout; // edi@28
+  int pSpriteID[4]; // [sp+84h] [bp-40h]@16
   Vec3_int_ pOut; // [sp+A0h] [bp-24h]@28
-  int a4; // [sp+ACh] [bp-18h]@1
-  int v38; // [sp+B0h] [bp-14h]@21
+  int pObjectY; // [sp+B0h] [bp-14h]@21
   int sRotX; // [sp+B4h] [bp-10h]@23
-  float v40; // [sp+B8h] [bp-Ch]@23
-  float v41; // [sp+BCh] [bp-8h]@23
+  float dir_z; // [sp+BCh] [bp-8h]@23
   int sRotY; // [sp+C0h] [bp-4h]@8
-  SpriteObject a1; // [sp+14h] [bp-B0h]@28
+  SpriteObject pSpellObject; // [sp+14h] [bp-B0h]@28
 
-  assert(uChestID < 20);
-  if ((uChestID <0)&&(uChestID >=20) )
-      return false;
+  assert( uChestID < 20 );
+  if ( ( uChestID < 0 ) && ( uChestID >= 20 ) )
+    return false;
   auto chest = &pChests[uChestID];
 
   ++pIcons_LOD->uTexturePacksCount;
@@ -92,144 +78,118 @@
 
   if ( !uActiveCharacter )
     return false;
-  *(float *)&sRotY = 0.0;
-  v2 = pMapStats->GetMapInfo(pCurrentMapName.data());
-  if ( !chest->Trapped() || !v2 )
-    goto LABEL_12;
-  if ( pPlayers[uActiveCharacter]->GetDisarmTrap() < 2 * pMapStats->pInfos[v2].LockX5 )
+  flag_shout = false;
+  pMapID = pMapStats->GetMapInfo(pCurrentMapName.data());
+  if ( chest->Trapped() && pMapID )
   {
-    v29[0] = 811;
-    v29[1] = 812;
-    v29[2] = 813;
-    v29[3] = 814;
-    v5 = rand() % 4;
-    v6 = PID_ID(EvtTargetObj);
-    if ( PID_TYPE(EvtTargetObj) == OBJECT_Decoration)
+    if ( pPlayers[uActiveCharacter]->GetDisarmTrap() < 2 * pMapStats->pInfos[pMapID].LockX5 )
     {
-      v14 = pLevelDecorations[v6].vPosition.x;
-      v38 = pLevelDecorations[v6].vPosition.y;
-      v17 = pDecorationList->pDecorations[pLevelDecorations[v6].uDecorationDescID].uDecorationHeight;
-      v15 = pLevelDecorations[v6].vPosition.z + (((signed int)v17 - HIDWORD(v17)) >> 1);
-    }
-    else
-    {
-      if ( PID_TYPE(EvtTargetObj) != OBJECT_BModel)
-        goto LABEL_12;
-      if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
+      pSpriteID[0] = 811;
+      pSpriteID[1] = 812;
+      pSpriteID[2] = 813;
+      pSpriteID[3] = 814;
+      pRandom = rand() % 4;
+      v6 = PID_ID(EvtTargetObj);
+      if ( PID_TYPE(EvtTargetObj) == OBJECT_Decoration)
+      {
+        pObjectX = pLevelDecorations[v6].vPosition.x;
+        pObjectY = pLevelDecorations[v6].vPosition.y;
+        pObjectZ = pLevelDecorations[v6].vPosition.z + ( pDecorationList->pDecorations[pLevelDecorations[v6].uDecorationDescID].uDecorationHeight / 2 );
+      }
+      if ( PID_TYPE(EvtTargetObj) == OBJECT_BModel)
       {
-        pOdmFace = &pOutdoor->pBModels[EvtTargetObj >> 9].pFaces[(EvtTargetObj >> 3) & 0x3F];
-        v8 = pOdmFace->pBoundingBox.y1;
-        v9 = pOdmFace->pBoundingBox.z2;
-        v10 = pOdmFace->pBoundingBox.x1 + pOdmFace->pBoundingBox.x2;
-        v11 = pOdmFace->pBoundingBox.y2;
-        v12 = pOdmFace->pBoundingBox.z1;
+        if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
+        {
+          pODMFace = &pOutdoor->pBModels[EvtTargetObj >> 9].pFaces[(EvtTargetObj >> 3) & 0x3F];
+          pObjectX = ( pODMFace->pBoundingBox.x1 + pODMFace->pBoundingBox.x2 ) / 2;
+          pObjectY = ( pODMFace->pBoundingBox.y1 + pODMFace->pBoundingBox.y2 ) / 2;
+          pObjectZ = ( pODMFace->pBoundingBox.z1 + pODMFace->pBoundingBox.z2 ) / 2;
+        }
+        else//Indoor
+        {
+          pBLVFace = &pIndoor->pFaces[v6];
+          pObjectX = ( pBLVFace->pBounding.x1 + pBLVFace->pBounding.x2 ) / 2;
+          pObjectY = ( pBLVFace->pBounding.y1 + pBLVFace->pBounding.y2 ) / 2;
+          pObjectZ = ( pBLVFace->pBounding.z1 + pBLVFace->pBounding.z2 ) / 2;
+        }
+      }
+      dir_x = (double)pParty->vPosition.x - (double)pObjectX;
+      dir_y = (double)pParty->vPosition.y - (double)pObjectY;
+      dir_z = ( (double)pParty->sEyelevel + (double)pParty->vPosition.z ) - (double)pObjectZ;
+      length_vector = sqrt( (dir_x * dir_x) + (dir_y * dir_y) + (dir_z * dir_z) );
+      if ( length_vector <= 1.0 )
+      {
+        *(float *)&sRotX = 0.0;
+        *(float *)&sRotY = 0.0;
       }
       else
       {
-        pBlvFace = &pIndoor->pFaces[v6];
-        v8 = pBlvFace->pBounding.y1;
-        v9 = pBlvFace->pBounding.z2;
-        v10 = pBlvFace->pBounding.x1 + pBlvFace->pBounding.x2;
-        v11 = pBlvFace->pBounding.y2;
-        v12 = pBlvFace->pBounding.z1;
+        sRotY = (signed __int64)sqrt(dir_x * dir_x + dir_y * dir_y);
+        sRotX = stru_5C6E00->Atan2((signed __int64)dir_x, (signed __int64)dir_y);
+        sRotY = stru_5C6E00->Atan2(dir_y * dir_y, (signed __int64)dir_z);
       }
-      v14 = v10 >> 1;
-      v38 = (v8 + v11) >> 1;
-      v15 = (v12 + v9) >> 1;
-    }
-    v18 = (double)pParty->vPosition.x - (double)v14;
-    *(float *)&a4 = v18;
-    v19 = (double)pParty->vPosition.y - (double)v38;
-    v33 = v19;
-    v41 = (double)pParty->sEyelevel + (double)pParty->vPosition.z - (double)v15;
-    *(float *)&sRotY = v19 * v19;
-    *(float *)&sRotX = v18 * v18;
-    v20 = sqrt(v41 * v41 + *(float *)&sRotX + *(float *)&sRotY);
-    v40 = v20;
-    if ( v20 <= 1.0 )
-    {
-      *(float *)&sRotX = 0.0;
-      *(float *)&sRotY = 0.0;
-    }
-    else
-    {
-      sRotY = (signed __int64)sqrt(*(float *)&sRotX + *(float *)&sRotY);
-      sRotX = stru_5C6E00->Atan2((signed __int64)*(float *)&a4, (signed __int64)v33);
-      sRotY = stru_5C6E00->Atan2(sRotY, (signed __int64)v41);
-    }
-    v21 = 256;
-    if ( v40 < 256.0 )
-      v21 = (signed __int64)v40 / 4;
-    *(int *)&v22[8] = v15;
-    *(_QWORD *)v22 = __PAIR__(v38, v14);
-    Vec3_int_::Rotate(v21, sRotX, sRotY, *(Vec3_int_ *)v22, &pOut.x, &pOut.z, &pOut.y);
-    v23 = (unsigned int *)(&v29 + v5);
-    sub_42F7EB_DropItemAt(*v23, pOut.x, pOut.z, pOut.y, 0, 1, 0, 0x30u, 0);
+      pDepth = 256;
+      if ( length_vector < 256.0 )
+        pDepth = (signed __int64)length_vector / 4;
+      v.x = pObjectX;
+      v.y = pObjectY;
+      v.z = pObjectZ;
+      Vec3_int_::Rotate(pDepth, sRotX, sRotY, v, &pOut.x, &pOut.z, &pOut.y);
+      sub_42F7EB_DropItemAt(pSpriteID[pRandom], pOut.x, pOut.z, pOut.y, 0, 1, 0, 48, 0);
 
-    a1.stru_24.Reset();
-    v24 = *(short *)v23;
-    v25 = 0;
-    a1.spell_skill = 0;
-    a1.spell_level = 0;
-    a1.spell_id = 0;
-    a1.field_54 = 0;
-    a1.uType = v24;
-    if ( (signed int)pObjectList->uNumObjects <= 0 )
-    {
-LABEL_32:
-      v27 = 0;
-    }
-    else
-    {
-      v26 = (char *)&pObjectList->pObjects->uObjectID;
-      while ( v24 != *(short *)v26 )
+      pSpellObject.stru_24.Reset();
+      pSpellObject.spell_skill = 0;
+      pSpellObject.spell_level = 0;
+      pSpellObject.spell_id = 0;
+      pSpellObject.field_54 = 0;
+      pSpellObject.uType = pSpriteID[pRandom];
+      pSpellObject.uObjectDescID = 0;
+      if ( pObjectList->uNumObjects )
       {
-        ++v25;
-        v26 += 56;
-        if ( v25 >= (signed int)pObjectList->uNumObjects )
-          goto LABEL_32;
+        for ( uint i = 0; i < (signed int)pObjectList->uNumObjects; ++i )
+        {
+          if ( pSpriteID[pRandom] == pObjectList->pObjects[i].uObjectID )
+            pSpellObject.uObjectDescID = i;
+        }
       }
-      v27 = v25;
+      pSpellObject.vPosition.y = pOut.z;
+      pSpellObject.vPosition.x = pOut.x;
+      pSpellObject.vPosition.z = pOut.y;
+      pSpellObject.uSoundID = 0;
+      pSpellObject.uAttributes = 48;
+      pSpellObject.uSectorID = pIndoor->GetSector(pOut.x, pOut.z, pOut.y);
+      pSpellObject.uSpriteFrameID = 0;
+      pSpellObject.spell_caster_pid = 0;
+      pSpellObject.spell_target_pid = 0;
+      pSpellObject.uFacing = 0;
+      pSpellObject.Create(0, 0, 0, 0);
+      pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0);
+      pSpellObject.ExplosionTraps();
+      chest->uFlags &= 0xFEu;
+      if ( uActiveCharacter && !qword_A750D8 && !OpenedTelekinesis )
+      {
+        qword_A750D8 = 256i64;
+        PlayerSpeechID = SPEECH_5;
+        uSpeakingCharacter = uActiveCharacter;
+      }
+      pIcons_LOD->RemoveTexturesPackFromTextureList();
+      OpenedTelekinesis = false;
+      return false;
     }
-    a1.uObjectDescID = v27;
-    a1.vPosition.y = pOut.z;
-    a1.vPosition.x = pOut.x;
-    a1.vPosition.z = pOut.y;
-    a1.uSoundID = 0;
-    a1.uAttributes = 48;
-    a1.uSectorID = pIndoor->GetSector(pOut.x, pOut.z, pOut.y);
-    a1.uSpriteFrameID = 0;
-    a1.spell_caster_pid = 0;
-    a1.spell_target_pid = 0;
-    a1.uFacing = 0;
-    a1.Create(0, 0, 0, 0);
-    pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0);
-    a1._438E35();
-    chest->SetInitialized(false);//*v34 &= 0xFEu;
-    if ( uActiveCharacter && !qword_A750D8 && !dword_507CD8 )
-    {
-      qword_A750D8 = 256i64;
-      word_A750E0 = 5;
-      word_A750E2 = uActiveCharacter;
-    }
-    pIcons_LOD->RemoveTexturesPackFromTextureList();
-    dword_507CD8 = 0;
-    return false;
+    chest->uFlags &= 0xFEu;
+    flag_shout = true;
   }
-  chest->SetInitialized(false);//*v1 &= 0xFEu;
-  sRotY = 1;
-LABEL_12:
   pAudioPlayer->StopChannels(-1, -1);
   pAudioPlayer->PlaySound(SOUND_OpenChest, 0, 0, -1, 0, 0, 0, 0);
-  if ( *(float *)&sRotY != 0.0 )
+  if ( flag_shout == true )
   {
-    if ( !dword_507CD8 )
+    if ( !OpenedTelekinesis )
       pPlayers[uActiveCharacter]->PlaySound(SPEECH_4, 0);
   }
-  dword_507CD8 = 0;
+  OpenedTelekinesis = false;
   pChestWindow = pGUIWindow_CurrentMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_Chest, uChestID, 0);
-  pBtn_ExitCancel = pChestWindow->CreateButton(471, 445, 169,  35, 1, 0, UIMSG_Escape, 0, 0, pGlobalTXT_LocalizationStrings[79], pIcons_LOD->GetTexture(uExitCancelTextureId),   0);// Exit
-                    pChestWindow->CreateButton(  7,   8, 460, 343, 1, 0, UIMSG_CHEST_ClickItem,      0, 0, "", 0);
+  pBtn_ExitCancel = pChestWindow->CreateButton(471, 445, 169,  35, 1, 0, UIMSG_Escape, 0, 0, pGlobalTXT_LocalizationStrings[79], pIcons_LOD->GetTexture(uExitCancelTextureId), 0);// Exit
+                    pChestWindow->CreateButton(  7,   8, 460, 343, 1, 0, UIMSG_CHEST_ClickItem, 0, 0, "", 0);
   pCurrentScreen = SCREEN_CHEST;
   pEventTimer->Pause();
   return true;