Mercurial > mm7
comparison LayingItem.cpp @ 225:e3fd201a58f0
Merge
author | Gloval |
---|---|
date | Sun, 17 Feb 2013 14:47:58 +0400 |
parents | 07eb7d649bd5 |
children | 2799737f8a74 |
comparison
equal
deleted
inserted
replaced
224:9917d3b4925e | 225:e3fd201a58f0 |
---|---|
111 { | 111 { |
112 unsigned int v1; // ecx@1 | 112 unsigned int v1; // ecx@1 |
113 unsigned __int16 *pAttributes; // ecx@2 | 113 unsigned __int16 *pAttributes; // ecx@2 |
114 unsigned __int16 v3; // ax@2 | 114 unsigned __int16 v3; // ax@2 |
115 | 115 |
116 __debugbreak(); // find out what's going on | 116 //__debugbreak(); // find out what's going on |
117 | 117 |
118 v1 = uLayingItemID; | 118 v1 = uLayingItemID; |
119 pLayingItems[v1].uObjectDescID = 0; | 119 pLayingItems[v1].uObjectDescID = 0; |
120 if ( pParty->bTurnBasedModeOn == 1 ) | 120 if ( pParty->bTurnBasedModeOn == 1 ) |
121 { | 121 { |
122 pAttributes = &pLayingItems[v1].uAttributes; | 122 pAttributes = &pLayingItems[v1].uAttributes; |
123 v3 = *pAttributes; | 123 v3 = *pAttributes; |
124 if ( *pAttributes & 4 ) | 124 if ( *pAttributes & 4 ) |
125 { | 125 { |
126 LOBYTE(v3) = v3 & 0xFB; | 126 v3 = v3 & 0xFB; |
127 --pTurnEngine->field_1C; | 127 --pTurnEngine->field_1C; |
128 *pAttributes = v3; | 128 *pAttributes = v3; |
129 } | 129 } |
130 } | 130 } |
131 } | 131 } |