comparison UIHouses.cpp @ 1237:8ee5f1554b64

Слияние
author Ritor1
date Sun, 09 Jun 2013 21:48:48 +0600
parents b237a61e61d3
children 77ea5c5f2c0b
comparison
equal deleted inserted replaced
1236:d7ba42663d59 1237:8ee5f1554b64
1826 /*v47[1] = &Dest; 1826 /*v47[1] = &Dest;
1827 v47[0] = &v51; 1827 v47[0] = &v51;
1828 v46 = &v50; 1828 v46 = &v50;
1829 v45 = (unsigned int)&v49; 1829 v45 = (unsigned int)&v49;
1830 v44 = &v48; 1830 v44 = &v48;
1831 v43 = pTmpBuf2;*/ 1831 v43 = pTmpBuf2.data();*/
1832 sprintf(pTmpBuf.data(), "%s\n \n%s%s%s%s%s", pTmpBuf2, v48[0], v48[1], v48[2], v48[3], v48[4]); 1832 sprintf(pTmpBuf.data(), "%s\n \n%s%s%s%s%s", pTmpBuf2.data(), v48[0], v48[1], v48[2], v48[3], v48[4]);
1833 v53.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf.data(), 3u); 1833 v53.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf.data(), 3u);
1834 } 1834 }
1835 else 1835 else
1836 { 1836 {
1837 LABEL_71: 1837 LABEL_71:
2060 v5 = &pMonsterStats->pInfos[word_F8B1A0]; 2060 v5 = &pMonsterStats->pInfos[word_F8B1A0];
2061 v6 = TargetColor(0xFFu, 0xFFu, 0xFFu); 2061 v6 = TargetColor(0xFFu, 0xFFu, 0xFFu);
2062 v7 = v5->pName; 2062 v7 = v5->pName;
2063 v8 = TargetColor(0xFFu, 0xFFu, 0x9Bu); 2063 v8 = TargetColor(0xFFu, 0xFFu, 0x9Bu);
2064 sprintf(pTmpBuf.data(), "\f%05d%s\f%05d", v8, v7, v6); 2064 sprintf(pTmpBuf.data(), "\f%05d%s\f%05d", v8, v7, v6);
2065 sprintf(pTmpBuf2.data(), dword_F8B1A4, pTmpBuf, 100 * v5->uLevel); 2065 sprintf(pTmpBuf2.data(), dword_F8B1A4, pTmpBuf.data(), 100 * v5->uLevel);
2066 current_npc_text = pTmpBuf2.data(); 2066 current_npc_text = pTmpBuf2.data();
2067 memcpy(&a1, pDialogueWindow, sizeof(a1)); 2067 memcpy(&a1, pDialogueWindow, sizeof(a1));
2068 w.uFrameWidth = 458; 2068 w.uFrameWidth = 458;
2069 w.uFrameZ = 457; 2069 w.uFrameZ = 457;
2070 pOutString = pFontArrus; 2070 pOutString = pFontArrus;