Mercurial > mm7

comparison SpriteObject.cpp @ 1036:7f8be9f9769e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
player recieve damage
author Gloval
date Wed, 22 May 2013 22:25:44 +0400
parents c45d51b3f4f4
children e23a79658fc5
comparison
equal deleted inserted replaced
1034:aa848c90181f 1036:7f8be9f9769e
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 }