diff mm7_4.cpp @ 726:9d13d2ec35a6

Слияние
author Ritor1
date Fri, 22 Mar 2013 01:29:46 +0600
parents 7037f22cd716 e7c86528a2b3
children 9f596a163257
line wrap: on
line diff
--- a/mm7_4.cpp	Fri Mar 22 01:29:25 2013 +0600
+++ b/mm7_4.cpp	Fri Mar 22 01:29:46 2013 +0600
@@ -5758,10 +5758,10 @@
 
 
 //----- (004AD504) --------------------------------------------------------
-int __fastcall sub_4AD504(unsigned int uFaceID)
+int __fastcall sub_4AD504(signed int sFaceID)
 {
   int result; // eax@1
-  unsigned int v2; // ebx@1
+  signed int v2; // ebx@1
   BLVFace *v3; // esi@3
   Texture *v4; // edi@6
   int v5; // eax@7
@@ -5885,17 +5885,17 @@
   unsigned int v123; // [sp+A0h] [bp-4h]@13
 
   result = pRenderer->uTargetSurfacePitch;
-  v2 = uFaceID;
+  v2 = sFaceID;
   v95 = pRenderer->uTargetSurfacePitch;
-  if ( (uFaceID & 0x80000000u) == 0 )
-  {
-    if ( (signed int)uFaceID < (signed int)pIndoor->uNumFaces )
-    {
-      v3 = &pIndoor->pFaces[uFaceID];
-      v91 = &pIndoor->pFaces[uFaceID];
+  if ( sFaceID >= 0 )
+  {
+    if ( sFaceID < (signed int)pIndoor->uNumFaces )
+    {
+      v3 = &pIndoor->pFaces[sFaceID];
+      v91 = &pIndoor->pFaces[sFaceID];
       if ( !pRenderer->pRenderD3D )
       {
-        result = sub_423B5D(uFaceID);
+        result = sub_423B5D(sFaceID);
         if ( result )
         {
           result = sub_424829(result, &stru_F8A590, pBLVRenderParams->field_7C, v2);
@@ -5926,7 +5926,7 @@
               a2 = stru_F8A590._viewport_space_y;
               v11 = stru_F8A590._viewport_space_y * pRenderer->uTargetSurfacePitch;
               v99 = 640 * stru_F8A590._viewport_space_y;
-              v86 = v4->pLevelOfDetail0;
+              v86 = v4->pLevelOfDetail0_prolly_alpha_mask;
               v87 = v4->pLevelOfDetail1;
               v88 = v4->pLevelOfDetail2;
               v89 = v4->pLevelOfDetail3;
@@ -6408,7 +6408,7 @@
           v49 = v4->uWidthMinus1;
           v47 = v4->uHeightMinus1 << 16;
           v9 = 16 - v4->uWidthLn2;
-          v10 = v4->pLevelOfDetail0;
+          v10 = v4->pLevelOfDetail0_prolly_alpha_mask;
           LOBYTE(v2->uAttributes) |= 0x80u;
           v48 = v9;
           v50 = v10;
@@ -9458,7 +9458,7 @@
 
 			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
 
-			if ( (sDialogue_SpeakingActorNPC_ID & 0x80000000u) == 0 )
+			if ( sDialogue_SpeakingActorNPC_ID >= 0 )
 				pDialogue_SpeakingActor->uAIState = Removed;
 			if ( uActiveCharacter )
 				pPlayers[uActiveCharacter]->PlaySound(SPEECH_61, 0);
@@ -9679,8 +9679,8 @@
 
 
 //----- (004B6478) --------------------------------------------------------
-int __cdecl sub_4B6478()
-{
+void sub_4B6478()
+    {
   GUIWindow *v0; // ebx@1
   Player *v1; // edi@1
   unsigned int v2; // eax@1
@@ -9787,7 +9787,7 @@
       ++pMessageQueue_50CBD0->uNumMessages;
     }*/
     pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, v5);
-    return result; // void func
+    return; // void func
   }
   if ( !(unsigned __int16)_449B57_test_bit((unsigned __int8 *)v1->_guilds_member_bits, word_4F0754[2 * (unsigned int)window_SpeakInHouse->ptr_1C]) )
   {
@@ -9795,13 +9795,12 @@
     v25 = v31;
     v26 = pFontArrus->CalcTextHeight(pNPCTopics[171].pText, &v28, 0, 0);
     v28.DrawTitleText(pFontArrus, 0, (212 - v26) / 2 + 101, v25, v24, 3u);
-    result = (int)pDialogueWindow;
     pDialogueWindow->pNumPresenceButton = 0;
-    return result;
-  }
-  result = sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win();
-  if ( !result )
-    return result;
+    return ;
+  }
+
+  if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
+    return;
   v8 = pDialogueWindow;
   v33 = 0;
   v34 = 0;
@@ -9832,17 +9831,18 @@
     strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);
     v22 = v31;
     v23 = pFontArrus->CalcTextHeight(pTmpBuf, &v28, 0, 0);
-    return (int)v28.DrawTitleText(pFontArrus, 0, (174 - v23) / 2 + 138, v22, pTmpBuf, 3u);
+    v28.DrawTitleText(pFontArrus, 0, (174 - v23) / 2 + 138, v22, pTmpBuf, 3u);
+    return; 
   }
   sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v32);
   v28.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u);
   v32 = (149 - v33) / v34;
   if ( (149 - v33) / v34 > 32 )
     v32 = 32;
-  result = v8->pStartingPosActiveItem;
-  v35 = result;
+
+  v35 = v8->pStartingPosActiveItem;
   v34 = (149 - v34 * v32 - v33) / 2 - v32 / 2 + 162;
-  if ( result < result + v8->pNumPresenceButton )
+  if ( v8->pStartingPosActiveItem < v8->pStartingPosActiveItem+ v8->pNumPresenceButton )
   {
     v33 = 2;
     do
@@ -9880,11 +9880,10 @@
       v8 = v29;
       ++v35;
       ++v33;
-      result = v29->pNumPresenceButton + v29->pStartingPosActiveItem;
-    }
-    while ( v35 < result );
-  }
-  return result;
+    }
+    while ( v35 <v29->pNumPresenceButton + v29->pStartingPosActiveItem );
+  }
+  return;
 }
 
 
@@ -10831,7 +10830,7 @@
 LABEL_19:
   strcpy(sHouseName, v21);
 LABEL_20:
-  pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)26, 0, (int)sHouseName);
+  pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Transition, 0, (int)sHouseName);
   //if ( BYTE1(pAnimatedRooms[p2DEvents_minus1___02[26 * v9]].field_C) )
   if ( pAnimatedRooms[p2DEvents[v9 - 1].uAnimationID].uRoomSoundId )
     HousePlaySomeSound(v9, 1);