Mercurial > mm7
diff Player.cpp @ 283:e3b70ba42154
Слияние
| author | Ritor1 |
|---|---|
| date | Sun, 17 Feb 2013 20:54:07 +0600 |
| parents | 87ab1603c937 47e06334c564 |
| children | 64770a1eb8e9 |
line wrap: on
line diff
--- a/Player.cpp Sun Feb 17 20:53:53 2013 +0600 +++ b/Player.cpp Sun Feb 17 20:54:07 2013 +0600 @@ -8378,7 +8378,7 @@ || var > VAR_History_28 || (v22 = var - 276, pParty->field_3C.field_4F0[2 * v22 + 1] | pParty->field_3C.field_4F0[2 * v22]) || (pParty->field_3C.field_4F0[2 * (var - 276)] = LODWORD(pParty->uTimePlayed), - v23 = *(&pStorylineText->field_0 + 3 * v22) == 0, + v23 = pStorylineText->StoreLine[v22].pText==0,//*(&pStorylineText->field_0 + 3 * v22) == 0, pParty->field_3C.field_4F0[2 * (var - 276) + 1] = HIDWORD(pParty->uTimePlayed), v23) ) return; @@ -9309,7 +9309,7 @@ || var > VAR_History_28 || (v25 = var - 276, pParty->field_3C.field_4F0[2 * v25 + 1] | pParty->field_3C.field_4F0[2 * v25]) || (pParty->field_3C.field_4F0[2 * (var - 276)] = LODWORD(pParty->uTimePlayed), - v26 = *(&pStorylineText->field_0 + 3 * v25) == 0, + v26 = pStorylineText->StoreLine[v25].pText==0,//*(&pStorylineText->field_0 + 3 * v25) == 0, pParty->field_3C.field_4F0[2 * (var - 276) + 1] = HIDWORD(pParty->uTimePlayed), v26) ) return;