Mercurial > mm7
comparison Actor.cpp @ 1092:38890b8385e4
Merge
author | Gloval |
---|---|
date | Sun, 26 May 2013 14:13:43 +0400 |
parents | cde32f9b5f33 |
children | cf6cd674c398 |
comparison
equal
deleted
inserted
replaced
1091:9c7eb4037567 | 1092:38890b8385e4 |
---|---|
1781 } | 1781 } |
1782 } | 1782 } |
1783 v20 = v6; | 1783 v20 = v6; |
1784 v21 = PID_TYPE(v6); | 1784 v21 = PID_TYPE(v6); |
1785 v22 = PID_ID(v20); | 1785 v22 = PID_ID(v20); |
1786 switch(v6) | 1786 switch(v21) |
1787 { | 1787 { |
1788 case OBJECT_Item: | 1788 case OBJECT_Item: |
1789 { | 1789 { |
1790 v30 = v22; | 1790 v30 = v22; |
1791 LODWORD(v45) = pSpriteObjects[v30].vPosition.x; | 1791 LODWORD(v45) = pSpriteObjects[v30].vPosition.x; |