Mercurial > mm7
diff mm7_5.cpp @ 263:8cf4fe6b4941
Слияние
author | Ritor1 |
---|---|
date | Mon, 18 Feb 2013 12:38:38 +0600 |
parents | 2d6dda2e0405 d1af3319bc44 |
children | fb890fb66cad |
line wrap: on
line diff
--- a/mm7_5.cpp Mon Feb 18 12:38:07 2013 +0600 +++ b/mm7_5.cpp Mon Feb 18 12:38:38 2013 +0600 @@ -13570,7 +13570,7 @@ dword_506548 = 0; dword_506520 = 0; v7 = *pStorylineText->StoreLine[v6].pText;//*(&pStorylineText->field_0 + 3 * v6); - v8 = sub_495461( + v8 = BuilDialogueString( pStorylineText->StoreLine[v6].pText, uActiveCharacter - 1, 0, @@ -16108,7 +16108,7 @@ a1.DrawTitleText(pFontArrus, 0, 0xCu, v13, v11, 3u); a1.uFrameWidth -= 24; a1.uFrameZ = a1.uFrameX + a1.uFrameWidth - 1; - v14 = sub_495461((char *)lpsz, uActiveCharacter - 1, 0, 0, 0, 0); + v14 = BuilDialogueString((char *)lpsz, uActiveCharacter - 1, 0, 0, 0, 0); a1.DrawText(pFontArrus, 100, 36, 0, v14, 0, 0, 0); } }