Mercurial > mm7

comparison Player.cpp @ 768:67b77b052ef3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Sat, 23 Mar 2013 21:16:04 +0200
parents a464d28566a6 90bcfb56c8f9
children 7bb33867d2cb
comparison
equal deleted inserted replaced
767:45615cacad31 768:67b77b052ef3
630 pPlayerNum = 0; 630 pPlayerNum = 0;
631 expression = (CHARACTER_EXPRESSION_ID)v20[rand() % v13]; 631 expression = (CHARACTER_EXPRESSION_ID)v20[rand() % v13];
632 if (expression == CHARACTER_EXPRESSION_21 && pSoundId ) 632 if (expression == CHARACTER_EXPRESSION_21 && pSoundId )
633 { 633 {
634 v17 = 0; 634 v17 = 0;
635 if ( (signed int)pSoundList->uNumSounds <= 0 ) 635 if ( (signed int)pSoundList->sNumSounds <= 0 )
636 { 636 {
637 LABEL_23: 637 LABEL_23:
638 v17 = 0; 638 v17 = 0;
639 } 639 }
640 else 640 else
642 pSoundID = (char *)&pSoundList->pSounds->uSoundID; 642 pSoundID = (char *)&pSoundList->pSounds->uSoundID;
643 while ( *(int *)pSoundID != pSoundId ) 643 while ( *(int *)pSoundID != pSoundId )
644 { 644 {
645 ++v17; 645 ++v17;
646 pSoundID += 120; 646 pSoundID += 120;
647 if ( v17 >= (signed int)pSoundList->uNumSounds ) 647 if ( v17 >= (signed int)pSoundList->sNumSounds )
648 goto LABEL_23; 648 goto LABEL_23;
649 } 649 }
650 } 650 }
651 if ( pSoundList->pSounds[v17].pSoundData[0] ) 651 if ( pSoundList->pSounds[v17].pSoundData[0] )
652 pPlayerNum = (sLastTrackLengthMS << 7) / 1000; 652 pPlayerNum = (sLastTrackLengthMS << 7) / 1000;