Mercurial > mm7

diff SpriteObject.cpp @ 1454:7d3bed7772cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 08 Aug 2013 16:34:37 +0600
parents 8ff3c675a726
children 7ef4b64f6329
line wrap: on
line diff
--- a/SpriteObject.cpp	Thu Aug 08 16:34:19 2013 +0600
+++ b/SpriteObject.cpp	Thu Aug 08 16:34:37 2013 +0600
@@ -1064,7 +1064,7 @@
     if (pSpriteObjects[uLayingItemID].uAttributes & 4 )
     {
       pSpriteObjects[uLayingItemID].uAttributes &= 0xFFFB;
-      --pTurnEngine->field_1C;
+      --pTurnEngine->pending_actions;
     }
   }
 }