mm7: mm7_4.cpp comparison

comparison mm7_4.cpp @ 454:5e5dfedcc0ad

Слияние

author	Ritor1
date	Sun, 24 Feb 2013 09:18:17 +0600
parents	f56c98a2ab52 4f451a616d3d
children	20d96ec810c8

comparison

equal deleted inserted replaced

-:eaadcb39312f
+:5e5dfedcc0ad
 int v21; // eax@27
 int v22; // ecx@29
 //BLVFace *v23; // eax@33
 //int v24; // esi@39
 //int v25; // edi@39
-int v26; // esi@41
+//int v26; // esi@41
 int v27; // ecx@43
 signed int v28; // eax@45
 int v29; // ebx@47
 int v30; // edx@49
 int v31; // ST10_4@49
 word_721460[2 * portal->uNumVertices] = word_721460[0];
 word_721390[2 * portal->uNumVertices] = word_721390[0];
 v54 = 0;
 v51 = 0;
 v49 = word_721390[0] >= y;
-if ( v26 > 0 )
+if ( portal->uNumVertices > 0 )
 {
 do
 {
 if ( v54 >= 2 )
 break;
 }
 }
 ++v51;
 v49 = v47;
 }
-while ( v51 < v26 );
+while ( v51 < 2 * portal->uNumVertices );
 if ( v54 == 1 )
 {
 if ( v55 >= 50 )
 break;
 v34 = v55++;
 side2_dy = (double)(x2z2_y - x1z2_y);
 side2_dx = (double)(grid_pos_x2 - grid_pos_x1);
 side1_dx = (double)(grid_pos_x1 - grid_pos_x1);
 side2_dz = (double)(grid_pos_z2 - grid_pos_z2);  // bug?  z2 - z2
 side1_dz = (double)(grid_pos_z2 - grid_pos_z2);  //       z1 - z2
-Log::Warning(L"%s %s %u\n", __FILE__, __FUNCTION__, __LINE__);
+Log::Warning(L"%S %S %u\n", __FILE__, __FUNCTION__, __LINE__);
 /*       |\
 side1 |  \
 |____\
 side 2      */
 }
 a1.uFrameZ = 366;
 a1.DrawTitleText(pFontCreate, 0, 2u, 0, v1, 3u);
 a1.uFrameX = 483;
 a1.uFrameWidth = 148;
 a1.uFrameZ = 334;
-v2 = (&off_4EB080)[4 * uHouse_ExitPic];
+v2 = pTransitionStrings[uHouse_ExitPic];
 if ( !v2 )
 {
 sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[411], v0);
 v2 = pTmpBuf;
 }
 dword_F8B19C = -1;
 }
 //----- (004B4224) --------------------------------------------------------
-GUIButton *_4B4224_UpdateNPCTopics(int _this)
+void _4B4224_UpdateNPCTopics( int _this )
-{
+	{
-int v1; // ebx@1
+int num_menu_buttons; // ebx@1
-GUIButton *result; // eax@3
 int i; // ebp@5
-signed int v4; // ebp@9
+// signed int v4; // ebp@9
-void *v5; // ecx@14
+int v6; // eax@16
-bool v6; // eax@16
+int v8; // eax@21
-void *v7; // ecx@19
+int v10; // eax@26
-bool v8; // eax@21
+int v12; // eax@31
-void *v9; // ecx@24
+int v14; // eax@36
-bool v10; // eax@26
+int v16; // eax@41
-void *v11; // ecx@29
-bool v12; // eax@31
-void *v13; // ecx@34
-bool v14; // eax@36
-void *v15; // ecx@39
-bool v16; // eax@41
 NPCData *v17; // [sp+10h] [bp-4h]@4
-v1 = 0;
+num_menu_buttons = 0;
 array_5913D8[6] = (NPCData *)(_this + 1);
 if ( _this + 1 == uNumDialogueNPCPortraits && uHouse_ExitPic )
 {
 pDialogueWindow->Release();
 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0);
-sprintf(byte_591098, pGlobalTXT_LocalizationStrings[411], pMapStats->pInfos[uHouse_ExitPic].pName);
+sprintf(sHouseName, pGlobalTXT_LocalizationStrings[LOCSTR_ENTER_S], pMapStats->pInfos[uHouse_ExitPic].pName);
-pBtn_ExitCancel = pDialogueWindow->CreateButton(
+pBtn_ExitCancel = pDialogueWindow->CreateButton( 566, 445, 75, 33, 1, 0, 0x71u, 0, 0x4Eu,
-0x236u,
-0x1BDu,
-0x4Bu,
-0x21u,
-1,
-0,
-0x71u,
-0,
-0x4Eu,
 pGlobalTXT_LocalizationStrings[34],// "Cancel"
-(Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0),
+(Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0),0);
-0);
+pBtn_YES = pDialogueWindow->CreateButton( 486u, 445u,  75u, 33u, 1, 0,  0xBFu,  1u,  0x59u,
-pBtn_YES = pDialogueWindow->CreateButton(
+sHouseName,
-486u,
+(Texture *)(uTextureID_BUTTYES2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTYES2] : 0), 0);
-445u,
+pDialogueWindow->CreateButton( pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], 63u, 73u, 1, 0,  0xBFu, 1u, 0x20u,  sHouseName, 0);
-75u,
+pDialogueWindow->CreateButton(8u, 8u, 460u, 344u, 1, 0, 0xBFu, 1u, 0x59u, sHouseName, 0);
-33u,
-1,
-0,
-0xBFu,
-1u,
-0x59u,
-byte_591098,
-(Texture *)(uTextureID_BUTTYES2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTYES2] : 0),
-0);
-pDialogueWindow->CreateButton(
-pNPCPortraits_x[0][0],
-pNPCPortraits_y[0][0],
-63u,
-73u,
-1,
-0,
-0xBFu,
-1u,
-0x20u,
-byte_591098,
-0);
-result = pDialogueWindow->CreateButton(8u, 8u, 460u, 344u, 1, 0, 0xBFu, 1u, 0x59u, byte_591098, 0);
 }
 else
 {
 v17 = array_5913D8[_this + 1 - ((dword_591080 != 0) + 1)];
 if ( dword_F8B19C == -1 )
 else
 {
 for ( i = 0; i < uNumDialogueNPCPortraits; ++i )
 GUIButton::_41D0D8((GUIButton *)array_5913D8[i + 7]);
 }
-v4 = 1;
 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0);
-pBtn_ExitCancel = pDialogueWindow->CreateButton(
+pBtn_ExitCancel = pDialogueWindow->CreateButton(  471u,  445u,  169u, 35u,  1,   0, 0x71u,  0,  0,
-471u,
-445u,
-169u,
-35u,
-1,
-0,
-0x71u,
-0,
-0,
 pGlobalTXT_LocalizationStrings[74],// "End Conversation"
-(Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0),
+(Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0),   0);
-0);
 pDialogueWindow->CreateButton(8u, 8u, 0x1C2u, 0x140u, 1, 0, 0x51u, 0, 0, "", 0);
 if ( array_5913D8[6] == (NPCData *)1 && dword_591080 )
 {
-result = (GUIButton *)sub_4B3B42(dword_F8B198);
+sub_4B3B42(dword_F8B198);
 }
 else
 {
 if ( v17->joins )
 {
-v1 = 1;
+num_menu_buttons = 1;
 pDialogueWindow->CreateButton(480u, 160u, 140u, 30u, 1, 0, 0xAFu, 0xDu, 0, "", 0);
 }
-v5 = (void *)v17->evt_A;
+if ( v17->evt_A)
-if ( v5 )
+{
-{
+if ( num_menu_buttons < 4 )
-if ( v1 < 4 )
+{
-{
+v6 = NPC_EventProcessor(v17->evt_A);
-v6 = sub_4466C4(v5);
 if ( v6 == 1 || v6 == 2 )
-pDialogueWindow->CreateButton(
+pDialogueWindow->CreateButton(  480u, 30 * num_menu_buttons++ + 160,  140u, 30u, 1, 0, 0xAFu, 0x13u,  0, "",  0);
-480u,
+}
-30 * v1++ + 160,
+}
-140u,
+if ( v17->evt_B )
-30u,
+{
-1,
+if ( num_menu_buttons < 4 )
-0,
+{
-0xAFu,
+v8 = NPC_EventProcessor(v17->evt_B);
-0x13u,
-0,
-"",
-0);
-}
-}
-v7 = (void *)v17->evt_B;
-if ( v7 )
-{
-if ( v1 < 4 )
-{
-v8 = sub_4466C4(v7);
 if ( v8 == 1 || v8 == 2 )
-pDialogueWindow->CreateButton(
+pDialogueWindow->CreateButton( 480u,  30 * num_menu_buttons++ + 160,  140u, 30u,  1, 0,  0xAFu,  0x14u,  0, "",  0);
-480u,
+}
-30 * v1++ + 160,
+}
-140u,
+if ( v17->evt_C )
-30u,
+{
-1,
+if ( num_menu_buttons < 4 )
-0,
+{
-0xAFu,
+v10 = NPC_EventProcessor(v17->evt_C);
-0x14u,
-0,
-"",
-0);
-}
-}
-v9 = (void *)v17->evt_C;
-if ( v9 )
-{
-if ( v1 < 4 )
-{
-v10 = sub_4466C4(v9);
 if ( v10 == 1 || v10 == 2 )
-pDialogueWindow->CreateButton(
+pDialogueWindow->CreateButton(  480u,  30 * num_menu_buttons++ + 160,  140u, 30u,  1,  0, 0xAFu, 0x15u, 0, "",  0);
-480u,
+}
-30 * v1++ + 160,
+}
-140u,
-30u,
+if ( v17->evt_D )
-1,
+{
-0,
+if ( num_menu_buttons < 4 )
-0xAFu,
+{
-0x15u,
+v12 = NPC_EventProcessor(v17->evt_D);
-0,
-"",
-0);
-}
-}
-v11 = (void *)v17->evt_D;
-if ( v11 )
-{
-if ( v1 < 4 )
-{
-v12 = sub_4466C4(v11);
 if ( v12 == 1 || v12 == 2 )
-pDialogueWindow->CreateButton(
+pDialogueWindow->CreateButton( 0x1E0u, 30 * num_menu_buttons++ + 160,  0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x16u,  0, "",  0);
-0x1E0u,
+}
-30 * v1++ + 160,
+}
-0x8Cu,
+if ( v17->evt_E )
-0x1Eu,
+{
-1,
+if ( num_menu_buttons < 4 )
-0,
+{
-0xAFu,
+v14 = NPC_EventProcessor(v17->evt_E);
-0x16u,
-0,
-"",
-0);
-}
-}
-v13 = (void *)v17->evt_E;
-if ( v13 )
-{
-if ( v1 < 4 )
-{
-v14 = sub_4466C4(v13);
 if ( v14 == 1 || v14 == 2 )
-pDialogueWindow->CreateButton(
+pDialogueWindow->CreateButton( 0x1E0u, 30 * num_menu_buttons++ + 160,  0x8Cu,  0x1Eu,  1,  0,  0xAFu, 0x17u,  0, "",  0);
-0x1E0u,
+}
-30 * v1++ + 160,
+}
-0x8Cu,
+if ( v17->evt_F )
-0x1Eu,
+{
-1,
+if ( num_menu_buttons < 4 )
-0,
+{
-0xAFu,
+v16 = NPC_EventProcessor(v17->evt_F);
-0x17u,
-0,
-"",
-0);
-}
-}
-v15 = (void *)v17->evt_F;
-if ( v15 )
-{
-if ( v1 < 4 )
-{
-v16 = sub_4466C4(v15);
 if ( v16 == 1 || v16 == 2 )
-pDialogueWindow->CreateButton(
+pDialogueWindow->CreateButton( 0x1E0u, 30 * num_menu_buttons++ + 160,  0x8Cu,  0x1Eu, 1, 0, 0xAFu, 0x18u, 0, "",  0);
-0x1E0u,
+}
-30 * v1++ + 160,
+}
-0x8Cu,
+pDialogueWindow->_41D08F(num_menu_buttons, 1, 0, 2);
-0x1Eu,
-1,
-0,
-0xAFu,
-0x18u,
-0,
-"",
-0);
-}
-}
-pDialogueWindow->_41D08F(v1, 1, 0, 2);
-v4 = 1;
-result = (GUIButton *)pDialogueWindow->pNumPresenceButton;
 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton;
 }
-dword_F8B19C = v4;
+dword_F8B19C = 1;
 }
-return result;
 }
 //----- (004B46A5) --------------------------------------------------------
 goto LABEL_44;
 }
 }
 LABEL_44:
 HIWORD(v25) = HIWORD(x);
-v0->some_x = a1a;
+v0->world_x = a1a;
-v0->some_y = a2;
+v0->world_y = a2;
-v0->some_z = a3;
+v0->world_z = a3;
 v0->uScreenSpaceX = v43;
 v0->uScreenSpaceY = a6;
 LOWORD(v25) = 0;
 LOBYTE(v26) = v41;
 //----- (00444732) --------------------------------------------------------
-char *_444732_GetEventHintString(unsigned int uEventID)
+char *GetEventHintString(unsigned int uEventID)
 {
-signed int v1; // edx@1
+signed int event_index; // edx@1
-char *v2; // eax@2
+int event_pos; // esi@4
-int v3; // ebx@4
-int v4; // esi@4
 char *result; // eax@6
-int v6; // eax@9
+unsigned int str_index; // eax@9
-char *i; // esi@11
+int i; // esi@11
-int v8; // edx@12
+_evt_raw*  test_evt;
+_evt_raw*  last_evt;
-v1 = 0;
-if ( (signed int)uLevelEVT_NumEvents <= 0 )
+event_index = 0;
-{
+if ( uLevelEVT_NumEvents <= 0 )
-LABEL_6:
+return NULL;
-result = 0;
-}
+//v2 = (char *)&pLevelEVT_Index[0].uEventOffsetInEVT;
-else
-{
-v2 = (char *)&pLevelEVT_Index[0].uEventOffsetInEVT;
 while ( 1 )
 {
-if ( *((int *)v2 - 2) == uEventID )
+if ( pLevelEVT_Index[event_index].uEventID == uEventID )
 {
-v3 = *(int *)v2;
+		test_evt=(_evt_raw*)&pLevelEVT[pLevelEVT_Index[event_index].uEventOffsetInEVT];
-v4 = *((int *)v2 + 3);
+		last_evt=test_evt;
-if ( pLevelEVT[*(int *)v2 + 4] == 4 )
+event_pos = pLevelEVT_Index[event_index+1].uEventOffsetInEVT;
+if ( test_evt->_e_type == EVENT_MouseOver )
 break;
 }
-++v1;
+++event_index;
-v2 += 12;
+if ( event_index >= uLevelEVT_NumEvents )
-if ( v1 >= (signed int)uLevelEVT_NumEvents )
+return NULL;
-goto LABEL_6;
+}
-}
+	test_evt=(_evt_raw*)&pLevelEVT[event_pos];
-if ( pLevelEVT[v4 + 4] == 2 )
+if ( test_evt->_e_type== EVENT_SpeakInHouse )
 {
-v6 = (unsigned __int8)pLevelEVT[v4 + 5]
+str_index = EVT_DWORD(test_evt->v5);
-+ (((unsigned __int8)pLevelEVT[v4 + 6]
+result = (char *)p2DEvents[str_index - 1].pName;
-+ (((unsigned __int8)pLevelEVT[v4 + 7] + ((unsigned __int8)pLevelEVT[v4 + 8] << 8)) << 8)) << 8);
-LABEL_10:
-//result = (char *)p2DEvents_minus1_::04[13 * v6];
-result = (char *)p2DEvents[v6 - 1].pName;
 }
 else
 {
-for ( i = (char *)pLevelEVT_Index + 4 * (3 * v1 + 3); *(int *)i == uEventID; i += 12 )
+for ( i = event_index+1; pLevelEVT_Index[i].uEventID  == uEventID; ++i )
 {
-v8 = *((int *)i + 2);
+event_pos = pLevelEVT_Index[i].uEventOffsetInEVT;
-if ( pLevelEVT[v8 + 4] == 2 )
+		test_evt=(_evt_raw*)&pLevelEVT[event_pos];
-{
+if ( test_evt->_e_type == EVENT_SpeakInHouse )
-v6 = (unsigned __int8)pLevelEVT[v8 + 5]
+{
-+ (((unsigned __int8)pLevelEVT[v8 + 6]
+str_index = EVT_DWORD(test_evt->v5);
-+ (((unsigned __int8)pLevelEVT[v8 + 7] + ((unsigned __int8)pLevelEVT[v8 + 8] << 8)) << 8)) << 8);
+if ( str_index < 600 )
-if ( (unsigned int)v6 < 0x258 )
+return (char *)p2DEvents[str_index - 1].pName;
-goto LABEL_10;
+}
 }
-}
+result = &pLevelStr[pLevelStrOffsets[EVT_BYTE(last_evt->v5)]];
-result = &pLevelStr[pLevelStrOffsets[(unsigned __int8)pLevelEVT[v3 + 5]]];
+}
-}
-}
 return result;
 }
 if ( v14 )
 {
 v20 = pMapStats->pInfos[v14].pName;
 v18 = pGlobalTXT_LocalizationStrings[410];
 LABEL_10:
-sprintf(byte_591098, v18, v20);
+sprintf(sHouseName, v18, v20);
 goto LABEL_20;
 }
 v21 = pGlobalTXT_LocalizationStrings[79];
 goto LABEL_19;
 }
 v18 = pGlobalTXT_LocalizationStrings[411];
 goto LABEL_10;
 }
 v21 = pGlobalTXT_LocalizationStrings[73];
 LABEL_19:
-strcpy(byte_591098, v21);
+strcpy(sHouseName, v21);
 LABEL_20:
-pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)26, 0, (int)byte_591098);
+pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)26, 0, (int)sHouseName);
 //if ( BYTE1(pAnimatedRooms[p2DEvents_minus1___02[26 * v9]].field_C) )
 if ( BYTE1(pAnimatedRooms[p2DEvents[v9 - 1].uAnimationID].field_C) )
 HousePlaySomeSound(v9, 1);
 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 )
 pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0);

Mercurial > mm7

comparison mm7_4.cpp @ 454:5e5dfedcc0ad