Mercurial > mm7
diff mm7_5.cpp @ 283:e3b70ba42154
Слияние
author | Ritor1 |
---|---|
date | Sun, 17 Feb 2013 20:54:07 +0600 |
parents | ccf14ac29caf 47e06334c564 |
children | 92d443ed0cba |
line wrap: on
line diff
--- a/mm7_5.cpp Sun Feb 17 20:53:53 2013 +0600 +++ b/mm7_5.cpp Sun Feb 17 20:54:07 2013 +0600 @@ -13533,7 +13533,7 @@ a1.uFrameX = 8; a1.uFrameY = 8; a1.uFrameHeight = 344; - v3 = (const char *)pStorylineText->field_4[3 * v2]; + v3 = (const char *)pStorylineText->StoreLine[v2].pText;//field_4[]; a1.uFrameZ = 467; a1.uFrameW = 351; if ( v3 ) @@ -13569,9 +13569,9 @@ v6 = pStru179.field_0[dword_506528]; dword_506548 = 0; dword_506520 = 0; - v7 = *(&pStorylineText->field_0 + 3 * v6); + v7 = *pStorylineText->StoreLine[v6].pText;//*(&pStorylineText->field_0 + 3 * v6); v8 = sub_495461( - *((char **)&pStorylineText->field_0 + 3 * v6), + pStorylineText->StoreLine[v6].pText, uActiveCharacter - 1, 0, 0,