Mercurial > mm7

comparison Player.cpp @ 283:e3b70ba42154

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 17 Feb 2013 20:54:07 +0600
parents 87ab1603c937 47e06334c564
children 64770a1eb8e9
comparison
equal deleted inserted replaced
282:87ab1603c937 283:e3b70ba42154
8376 } 8376 }
8377 if ( var <= VAR_ReputationInCurrentLocation 8377 if ( var <= VAR_ReputationInCurrentLocation
8378 || var > VAR_History_28 8378 || var > VAR_History_28
8379 || (v22 = var - 276, pParty->field_3C.field_4F0[2 * v22 + 1] | pParty->field_3C.field_4F0[2 * v22]) 8379 || (v22 = var - 276, pParty->field_3C.field_4F0[2 * v22 + 1] | pParty->field_3C.field_4F0[2 * v22])
8380 || (pParty->field_3C.field_4F0[2 * (var - 276)] = LODWORD(pParty->uTimePlayed), 8380 || (pParty->field_3C.field_4F0[2 * (var - 276)] = LODWORD(pParty->uTimePlayed),
8381 v23 = *(&pStorylineText->field_0 + 3 * v22) == 0, 8381 v23 = pStorylineText->StoreLine[v22].pText==0,//*(&pStorylineText->field_0 + 3 * v22) == 0,
8382 pParty->field_3C.field_4F0[2 * (var - 276) + 1] = HIDWORD(pParty->uTimePlayed), 8382 pParty->field_3C.field_4F0[2 * (var - 276) + 1] = HIDWORD(pParty->uTimePlayed),
8383 v23) ) 8383 v23) )
8384 return; 8384 return;
8385 bFlashHistoryBook = 1; 8385 bFlashHistoryBook = 1;
8386 } 8386 }
9307 { 9307 {
9308 if ( var <= VAR_ReputationInCurrentLocation 9308 if ( var <= VAR_ReputationInCurrentLocation
9309 || var > VAR_History_28 9309 || var > VAR_History_28
9310 || (v25 = var - 276, pParty->field_3C.field_4F0[2 * v25 + 1] | pParty->field_3C.field_4F0[2 * v25]) 9310 || (v25 = var - 276, pParty->field_3C.field_4F0[2 * v25 + 1] | pParty->field_3C.field_4F0[2 * v25])
9311 || (pParty->field_3C.field_4F0[2 * (var - 276)] = LODWORD(pParty->uTimePlayed), 9311 || (pParty->field_3C.field_4F0[2 * (var - 276)] = LODWORD(pParty->uTimePlayed),
9312 v26 = *(&pStorylineText->field_0 + 3 * v25) == 0, 9312 v26 = pStorylineText->StoreLine[v25].pText==0,//*(&pStorylineText->field_0 + 3 * v25) == 0,
9313 pParty->field_3C.field_4F0[2 * (var - 276) + 1] = HIDWORD(pParty->uTimePlayed), 9313 pParty->field_3C.field_4F0[2 * (var - 276) + 1] = HIDWORD(pParty->uTimePlayed),
9314 v26) ) 9314 v26) )
9315 return; 9315 return;
9316 bFlashHistoryBook = 1; 9316 bFlashHistoryBook = 1;
9317 _play_sound: 9317 _play_sound: