Mercurial > mm7

comparison UI/UIShops.cpp @ 1588:e6ac4919b22c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 09 Sep 2013 09:13:40 +0600
parents 9f8b3e904e14
children 96d567a7d15f
comparison
equal deleted inserted replaced
1587:b42e6f35e03d 1588:e6ac4919b22c
284 if((v2 = pMouse->GetCursorPos(&a2)->x - 14, v106.x = (v2 >> 5) + 14 * ((pMouse->GetCursorPos(&v87)->y - 17) >> 5), 284 if((v2 = pMouse->GetCursorPos(&a2)->x - 14, v106.x = (v2 >> 5) + 14 * ((pMouse->GetCursorPos(&v87)->y - 17) >> 5),
285 pMouse->GetCursorPos(&v100)->x <= 13) || pMouse->GetCursorPos(&v92)->x >= 462 285 pMouse->GetCursorPos(&v100)->x <= 13) || pMouse->GetCursorPos(&v92)->x >= 462
286 || (pNumActiveItem = pPlayer->GetItemIDAtInventoryIndex((int *)&v106.x), !pNumActiveItem) ) 286 || (pNumActiveItem = pPlayer->GetItemIDAtInventoryIndex((int *)&v106.x), !pNumActiveItem) )
287 return; 287 return;
288 v4 = (ItemGen *)&pPlayer->pInventoryItemList[pNumActiveItem - 1]; 288 v4 = (ItemGen *)&pPlayer->pInventoryItemList[pNumActiveItem - 1];
289 if (!v4->Identified()) 289 if (!v4->IsIdentified())
290 { 290 {
291 v10 = pPlayer->SelectPhrasesTransaction(v4, BuildingType_WeaponShop, (int)window_SpeakInHouse->ptr_1C, 4); 291 v10 = pPlayer->SelectPhrasesTransaction(v4, BuildingType_WeaponShop, (int)window_SpeakInHouse->ptr_1C, 4);
292 v7 = BuildDialogueString((char *)pMerchantsIdentifyPhrases[v10], uActiveCharacter - 1, v4, (char *)window_SpeakInHouse->ptr_1C, 4, 0); 292 v7 = BuildDialogueString((char *)pMerchantsIdentifyPhrases[v10], uActiveCharacter - 1, v4, (char *)window_SpeakInHouse->ptr_1C, 4, 0);
293 pTextHeight = pFontArrus->CalcTextHeight(v7, &dialog_window, 0, 0); 293 pTextHeight = pFontArrus->CalcTextHeight(v7, &dialog_window, 0, 0);
294 dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, pColorWhite, v7, 3); 294 dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, pColorWhite, v7, 3);
916 { 916 {
917 v2 = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&pItemCount); 917 v2 = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&pItemCount);
918 if ( v2 ) 918 if ( v2 )
919 { 919 {
920 v3 = (ItemGen *)&pPlayers[uActiveCharacter]->pInventoryItemList[v2-1]; 920 v3 = (ItemGen *)&pPlayers[uActiveCharacter]->pInventoryItemList[v2-1];
921 if (v3->Identified()) 921 if (v3->IsIdentified())
922 v5 = "%24"; 922 v5 = "%24";
923 else 923 else
924 { 924 {
925 v8 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(v3, BuildingType_ArmorShop, (int)window_SpeakInHouse->ptr_1C, 4); 925 v8 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(v3, BuildingType_ArmorShop, (int)window_SpeakInHouse->ptr_1C, 4);
926 v5 = (char *)pMerchantsIdentifyPhrases[v8]; 926 v5 = (char *)pMerchantsIdentifyPhrases[v8];
1405 if ((v36 = pMouse->GetCursorPos(&a2)->x - 14, v109 = (v36 >> 5) + 14 * ((pMouse->GetCursorPos(&v94)->y - 17) >> 5), 1405 if ((v36 = pMouse->GetCursorPos(&a2)->x - 14, v109 = (v36 >> 5) + 14 * ((pMouse->GetCursorPos(&v94)->y - 17) >> 5),
1406 pMouse->GetCursorPos(&v101)->x <= 13) || pMouse->GetCursorPos(&v97)->x >= 462 1406 pMouse->GetCursorPos(&v101)->x <= 13) || pMouse->GetCursorPos(&v97)->x >= 462
1407 || (pNumActiveItem = pPlayer->GetItemIDAtInventoryIndex((int *)&v109), !pNumActiveItem) ) 1407 || (pNumActiveItem = pPlayer->GetItemIDAtInventoryIndex((int *)&v109), !pNumActiveItem) )
1408 return; 1408 return;
1409 v37 = (ItemGen *)&pPlayer->pInventoryItemList[pNumActiveItem - 1]; 1409 v37 = (ItemGen *)&pPlayer->pInventoryItemList[pNumActiveItem - 1];
1410 if (!v37->Identified()) 1410 if (!v37->IsIdentified())
1411 { 1411 {
1412 v42 = pPlayer->SelectPhrasesTransaction(v37, BuildingType_AlchemistShop, (int)window_SpeakInHouse->ptr_1C, 4); 1412 v42 = pPlayer->SelectPhrasesTransaction(v37, BuildingType_AlchemistShop, (int)window_SpeakInHouse->ptr_1C, 4);
1413 v38 = (char *)pMerchantsIdentifyPhrases[v42]; 1413 v38 = (char *)pMerchantsIdentifyPhrases[v42];
1414 } 1414 }
1415 else 1415 else