Mercurial > mm7

comparison SpriteObject.cpp @ 1048:d36681a9e4f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 23 May 2013 11:17:01 +0600
parents 7f8be9f9769e
children e23a79658fc5
comparison
equal deleted inserted replaced
1047:76ce871b0076 1048:d36681a9e4f8
1078 do 1078 do
1079 { 1079 {
1080 if ( (*v12)->CanAct() && (v13 = (*v12)->GetPerception() + 20, rand() % v13 > 20) ) 1080 if ( (*v12)->CanAct() && (v13 = (*v12)->GetPerception() + 20, rand() % v13 > 20) )
1081 (*v12)->PlaySound(SPEECH_6, 0); 1081 (*v12)->PlaySound(SPEECH_6, 0);
1082 else 1082 else
1083 (*v12)->ReceiveDamage(v11, v18); 1083 (*v12)->ReceiveDamage(v11, (DAMAGE_TYPE)v18);
1084 ++v12; 1084 ++v12;
1085 } 1085 }
1086 while ( (signed int)v12 <= (signed int)&pPlayers[4] ); 1086 while ( (signed int)v12 <= (signed int)&pPlayers[4] );
1087 } 1087 }
1088 } 1088 }