Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/SpriteObject.cpp	Thu May 23 11:16:46 2013 +0600
+++ b/SpriteObject.cpp	Thu May 23 11:17:01 2013 +0600
@@ -1080,7 +1080,7 @@
       if ( (*v12)->CanAct() && (v13 = (*v12)->GetPerception() + 20, rand() % v13 > 20) )
         (*v12)->PlaySound(SPEECH_6, 0);
       else
-        (*v12)->ReceiveDamage(v11, v18);
+        (*v12)->ReceiveDamage(v11, (DAMAGE_TYPE)v18);
       ++v12;
     }
     while ( (signed int)v12 <= (signed int)&pPlayers[4] );