Mercurial > mm7

comparison mm7_4.cpp @ 424:afad358dc684

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Sat, 23 Feb 2013 23:15:31 +0400
parents 88c30918eef7 e9a9f97ffbc7
children b663aca70246
comparison
equal deleted inserted replaced
423:88c30918eef7 424:afad358dc684
11207 pDialogueWindow->Release(); 11207 pDialogueWindow->Release();
11208 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0); 11208 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0);
11209 sprintf(sHouseName, pGlobalTXT_LocalizationStrings[LOCSTR_ENTER_S], pMapStats->pInfos[uHouse_ExitPic].pName); 11209 sprintf(sHouseName, pGlobalTXT_LocalizationStrings[LOCSTR_ENTER_S], pMapStats->pInfos[uHouse_ExitPic].pName);
11210 pBtn_ExitCancel = pDialogueWindow->CreateButton( 566, 445, 75, 33, 1, 0, 0x71u, 0, 0x4Eu, 11210 pBtn_ExitCancel = pDialogueWindow->CreateButton( 566, 445, 75, 33, 1, 0, 0x71u, 0, 0x4Eu,
11211 pGlobalTXT_LocalizationStrings[34],// "Cancel" 11211 pGlobalTXT_LocalizationStrings[34],// "Cancel"
11212 (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), 0); 11212 (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0),
11213 pBtn_YES = pDialogueWindow->CreateButton( 486u, 445u, 75u, 33u, 1, 0, 0xBFu, 1u, 0x59u, 11213 pBtn_YES = pDialogueWindow->CreateButton( 486u, 445u, 75u, 33u, 1, 0, 0xBFu, 1u, 0x59u,
11214 sHouseName, 11214 sHouseName,
11215 (Texture *)(uTextureID_BUTTYES2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTYES2] : 0), 0); 11215 (Texture *)(uTextureID_BUTTYES2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTYES2] : 0), 0);
11216 pDialogueWindow->CreateButton(pNPCPortraits_x, pNPCPortraits_y, 63u, 73u, 1, 0, 0xBFu, 1u, 0x20u, sHouseName, 0); 11216 pDialogueWindow->CreateButton( pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], 63u, 73u, 1, 0, 0xBFu, 1u, 0x20u, sHouseName, 0);
11217 pDialogueWindow->CreateButton(8u, 8u, 460u, 344u, 1, 0, 0xBFu, 1u, 0x59u, sHouseName, 0); 11217 pDialogueWindow->CreateButton(8u, 8u, 460u, 344u, 1, 0, 0xBFu, 1u, 0x59u, sHouseName, 0);
11218 } 11218 }
11219 else 11219 else
11220 { 11220 {
11221 v17 = array_5913D8[_this + 1 - ((dword_591080 != 0) + 1)]; 11221 v17 = array_5913D8[_this + 1 - ((dword_591080 != 0) + 1)];
13131 const char *v49; // edx@73 13131 const char *v49; // edx@73
13132 GUIButton *v50; // esi@73 13132 GUIButton *v50; // esi@73
13133 int v51; // eax@73 13133 int v51; // eax@73
13134 unsigned int v52; // ecx@73 13134 unsigned int v52; // ecx@73
13135 unsigned __int16 v53; // ax@73 13135 unsigned __int16 v53; // ax@73
13136 char a1[100]; // [sp+10h] [bp-1B4h]@64 13136 char a1[300]; // [sp+10h] [bp-1B4h]@64
13137 char Dest; // [sp+74h] [bp-150h]@66
13138 char v56; // [sp+D8h] [bp-ECh]@66
13139 GUIWindow v57; // [sp+13Ch] [bp-88h]@1 13137 GUIWindow v57; // [sp+13Ch] [bp-88h]@1
13140 __int64 v58; // [sp+190h] [bp-34h]@1 13138 __int64 v58; // [sp+190h] [bp-34h]@1
13141 __int64 v59; // [sp+198h] [bp-2Ch]@1 13139 __int64 v59; // [sp+198h] [bp-2Ch]@1
13142 __int64 v60; // [sp+1A0h] [bp-24h]@1 13140 __int64 v60; // [sp+1A0h] [bp-24h]@1
13143 GUIWindow *v61; // [sp+1ACh] [bp-18h]@6 13141 GUIWindow *v61; // [sp+1ACh] [bp-18h]@6
13408 if ( v1->_4B6FF9() ) 13406 if ( v1->_4B6FF9() )
13409 { 13407 {
13410 sprintf(a1, "%s %d %s", pGlobalTXT_LocalizationStrings[104], HIDWORD(v60), pGlobalTXT_LocalizationStrings[97]); 13408 sprintf(a1, "%s %d %s", pGlobalTXT_LocalizationStrings[104], HIDWORD(v60), pGlobalTXT_LocalizationStrings[97]);
13411 v63 = 0; 13409 v63 = 0;
13412 } 13410 }
13413 strcpy(&Dest, pGlobalTXT_LocalizationStrings[68]); 13411 strcpy(&a1[100], pGlobalTXT_LocalizationStrings[68]);
13414 strcpy(&v56, pGlobalTXT_LocalizationStrings[160]); 13412 strcpy(&a1[200], pGlobalTXT_LocalizationStrings[160]);
13415 v42 = v63; 13413 v42 = v63;
13416 v43 = pDialogueWindow; 13414 v43 = pDialogueWindow;
13417 v44 = v63; 13415 v44 = v63;
13418 v66 = 0; 13416 v66 = 0;
13419 if ( v63 < pDialogueWindow->pNumPresenceButton ) 13417 if ( v63 < pDialogueWindow->pNumPresenceButton )
14250 { 14248 {
14251 v5 = v4->uCurrentActionLength; 14249 v5 = v4->uCurrentActionLength;
14252 v4->uCurrentActionTime += pMiscTimer->uTimeElapsed; 14250 v4->uCurrentActionTime += pMiscTimer->uTimeElapsed;
14253 if ( (signed int)v4->uCurrentActionTime >= v5 ) 14251 if ( (signed int)v4->uCurrentActionTime >= v5 )
14254 { 14252 {
14255 v17 = dword_4F6E08[v20]; 14253 v17 = ai_near_actors_targets_pid[v20];
14256 v6 = Actor::GetDirectionInfo(8 * v20 | 3, v17, &a3, v2); 14254 v6 = Actor::GetDirectionInfo(8 * v20 | OBJECT_Actor, v17, &a3, v2);
14257 v7 = v4->uAIState; 14255 v7 = v4->uAIState;
14258 memcpy(&v15, v6, sizeof(v15)); 14256 memcpy(&v15, v6, sizeof(v15));
14259 v8 = v7 - 4; 14257 v8 = v7 - 4;
14260 memcpy(&v14, &v15, sizeof(v14)); 14258 memcpy(&v14, &v15, sizeof(v14));
14261 if ( v8 ) 14259 if ( v8 )