Mercurial > mm7
diff mm7_4.cpp @ 424:afad358dc684
Merge
author | Gloval |
---|---|
date | Sat, 23 Feb 2013 23:15:31 +0400 |
parents | 88c30918eef7 e9a9f97ffbc7 |
children | b663aca70246 |
line wrap: on
line diff
--- a/mm7_4.cpp Sat Feb 23 23:09:48 2013 +0400 +++ b/mm7_4.cpp Sat Feb 23 23:15:31 2013 +0400 @@ -11209,11 +11209,11 @@ sprintf(sHouseName, pGlobalTXT_LocalizationStrings[LOCSTR_ENTER_S], pMapStats->pInfos[uHouse_ExitPic].pName); pBtn_ExitCancel = pDialogueWindow->CreateButton( 566, 445, 75, 33, 1, 0, 0x71u, 0, 0x4Eu, pGlobalTXT_LocalizationStrings[34],// "Cancel" - (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), 0); + (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), pBtn_YES = pDialogueWindow->CreateButton( 486u, 445u, 75u, 33u, 1, 0, 0xBFu, 1u, 0x59u, sHouseName, (Texture *)(uTextureID_BUTTYES2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTYES2] : 0), 0); - pDialogueWindow->CreateButton(pNPCPortraits_x, pNPCPortraits_y, 63u, 73u, 1, 0, 0xBFu, 1u, 0x20u, sHouseName, 0); + pDialogueWindow->CreateButton( pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], 63u, 73u, 1, 0, 0xBFu, 1u, 0x20u, sHouseName, 0); pDialogueWindow->CreateButton(8u, 8u, 460u, 344u, 1, 0, 0xBFu, 1u, 0x59u, sHouseName, 0); } else @@ -13133,9 +13133,7 @@ int v51; // eax@73 unsigned int v52; // ecx@73 unsigned __int16 v53; // ax@73 - char a1[100]; // [sp+10h] [bp-1B4h]@64 - char Dest; // [sp+74h] [bp-150h]@66 - char v56; // [sp+D8h] [bp-ECh]@66 + char a1[300]; // [sp+10h] [bp-1B4h]@64 GUIWindow v57; // [sp+13Ch] [bp-88h]@1 __int64 v58; // [sp+190h] [bp-34h]@1 __int64 v59; // [sp+198h] [bp-2Ch]@1 @@ -13410,8 +13408,8 @@ sprintf(a1, "%s %d %s", pGlobalTXT_LocalizationStrings[104], HIDWORD(v60), pGlobalTXT_LocalizationStrings[97]); v63 = 0; } - strcpy(&Dest, pGlobalTXT_LocalizationStrings[68]); - strcpy(&v56, pGlobalTXT_LocalizationStrings[160]); + strcpy(&a1[100], pGlobalTXT_LocalizationStrings[68]); + strcpy(&a1[200], pGlobalTXT_LocalizationStrings[160]); v42 = v63; v43 = pDialogueWindow; v44 = v63; @@ -14252,8 +14250,8 @@ v4->uCurrentActionTime += pMiscTimer->uTimeElapsed; if ( (signed int)v4->uCurrentActionTime >= v5 ) { - v17 = dword_4F6E08[v20]; - v6 = Actor::GetDirectionInfo(8 * v20 | 3, v17, &a3, v2); + v17 = ai_near_actors_targets_pid[v20]; + v6 = Actor::GetDirectionInfo(8 * v20 | OBJECT_Actor, v17, &a3, v2); v7 = v4->uAIState; memcpy(&v15, v6, sizeof(v15)); v8 = v7 - 4;