Mercurial > mm7

comparison Engine/Graphics/Outdoor.cpp @ 2566:30eb6dcac768

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
big spell fx overhaul
author a.parshin
date Wed, 20 May 2015 21:05:07 +0200
parents b8a56afc6ba1
children d569340b05ff
comparison
equal deleted inserted replaced
2565:117c219bf913 2566:30eb6dcac768
2263 { 2263 {
2264 if ( pSpriteObjects[i].uObjectDescID ) 2264 if ( pSpriteObjects[i].uObjectDescID )
2265 { 2265 {
2266 if ( !(pSpriteObjects[i].uAttributes & 8) && !(pObjectList->pObjects[pSpriteObjects[i].uObjectDescID].uFlags & 0x10) ) 2266 if ( !(pSpriteObjects[i].uAttributes & 8) && !(pObjectList->pObjects[pSpriteObjects[i].uObjectDescID].uFlags & 0x10) )
2267 pSpriteObjects[i].vPosition.z = GetTerrainHeightsAroundParty2(pSpriteObjects[i].vPosition.x, pSpriteObjects[i].vPosition.y, (int *)&v5, 0); 2267 pSpriteObjects[i].vPosition.z = GetTerrainHeightsAroundParty2(pSpriteObjects[i].vPosition.x, pSpriteObjects[i].vPosition.y, (int *)&v5, 0);
2268 if ( pSpriteObjects[i].stru_24.uItemID ) 2268 if (pSpriteObjects[i].containing_item.uItemID)
2269 { 2269 {
2270 if ( pSpriteObjects[i].stru_24.uItemID != 220 2270 if (pSpriteObjects[i].containing_item.uItemID != 220
2271 && pItemsTable->pItems[pSpriteObjects[i].stru_24.uItemID].uEquipType == EQUIP_POTION 2271 && pItemsTable->pItems[pSpriteObjects[i].containing_item.uItemID].uEquipType == EQUIP_POTION
2272 && !pSpriteObjects[i].stru_24.uEnchantmentType ) 2272 && !pSpriteObjects[i].containing_item.uEnchantmentType)
2273 pSpriteObjects[i].stru_24.uEnchantmentType = rand() % 15 + 5; 2273 pSpriteObjects[i].containing_item.uEnchantmentType = rand() % 15 + 5;
2274 pItemsTable->SetSpecialBonus(&pSpriteObjects[i].stru_24); 2274 pItemsTable->SetSpecialBonus(&pSpriteObjects[i].containing_item);
2275 } 2275 }
2276 } 2276 }
2277 } 2277 }
2278 } 2278 }
2279 pGameLoadingUI_ProgressBar->Progress(); 2279 pGameLoadingUI_ProgressBar->Progress();