Mercurial > mm7
comparison Outdoor.cpp @ 718:a5ee769b02c6
Слияние
author | Ritor1 |
---|---|
date | Mon, 18 Mar 2013 01:51:31 +0600 |
parents | b097497f07e2 |
children | 735dab8d3c9a 256211e8243a |
comparison
equal
deleted
inserted
replaced
717:d5473972234d | 718:a5ee769b02c6 |
---|---|
3156 v28->field_14_actor_id = i; | 3156 v28->field_14_actor_id = i; |
3157 v35 = pMonsterList->pMonsters; | 3157 v35 = pMonsterList->pMonsters; |
3158 v36 = actor->pMonsterInfo.uID; | 3158 v36 = actor->pMonsterInfo.uID; |
3159 v28->field_1E = v62 | 0x200; | 3159 v28->field_1E = v62 | 0x200; |
3160 v28->pSpriteFrame = v15; | 3160 v28->pSpriteFrame = v15; |
3161 v28->uTintColor = *((int *)&v35[v36] - 36); | 3161 v28->uTintColor = pMonsterList->pMonsters[actor->pMonsterInfo.uID-1].uTintColor;//*((int *)&v35[v36] - 36); |
3162 if (actor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime) | 3162 if (actor->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime) |
3163 v28->field_1E = v62 | 0x200; | 3163 v28->field_1E = v62 | 0x200; |
3164 } | 3164 } |
3165 //LABEL_58: | 3165 //LABEL_58: |
3166 //++v59; | 3166 //++v59; |