comparison mm7_5.cpp @ 596:b5240254cbbd

Merge
author Nomad
date Wed, 06 Mar 2013 16:51:39 +0200
parents 96f48cfdd657 c697d17c5179
children db4a23580e6c
comparison
equal deleted inserted replaced
595:55d6b756e03a 596:b5240254cbbd
16025 if (!( (signed int)pX < 566 || (signed int)pX > 629 || (signed int)pY < 156 || (signed int)pY > 229 )) 16025 if (!( (signed int)pX < 566 || (signed int)pX > 629 || (signed int)pY < 156 || (signed int)pY > 229 ))
16026 { 16026 {
16027 pAudioPlayer->StopChannels(-1, -1); 16027 pAudioPlayer->StopChannels(-1, -1);
16028 v3 = (void *)1; 16028 v3 = (void *)1;
16029 } 16029 }
16030 else
16031 {
16032 sub_416B01(v3);
16033 }
16034 } 16030 }
16035 else 16031 else
16036 { 16032 {
16037 pAudioPlayer->StopChannels(-1, -1); 16033 pAudioPlayer->StopChannels(-1, -1);
16038 v3 = 0; 16034 v3 = 0;