Mercurial > mm7
diff Engine/Objects/Chest.cpp @ 2566:30eb6dcac768
big spell fx overhaul
author | a.parshin |
---|---|
date | Wed, 20 May 2015 21:05:07 +0200 |
parents | fb42e2662c38 |
children | d569340b05ff |
line wrap: on
line diff
--- a/Engine/Objects/Chest.cpp Wed May 20 15:12:33 2015 +0200 +++ b/Engine/Objects/Chest.cpp Wed May 20 21:05:07 2015 +0200 @@ -56,7 +56,7 @@ int pDepth; // ecx@26 Vec3_int_ v; // ST4C_12@28 bool flag_shout; // edi@28 - int pSpriteID[4]; // [sp+84h] [bp-40h]@16 + SPRITE_OBJECT_TYPE pSpriteID[4]; // [sp+84h] [bp-40h]@16 Vec3_int_ pOut; // [sp+A0h] [bp-24h]@28 int pObjectY; // [sp+B0h] [bp-14h]@21 int sRotX; // [sp+B4h] [bp-10h]@23 @@ -84,10 +84,10 @@ { if ( pPlayers[uActiveCharacter]->GetDisarmTrap() < 2 * pMapStats->pInfos[pMapID].LockX5 ) { - pSpriteID[0] = 811; - pSpriteID[1] = 812; - pSpriteID[2] = 813; - pSpriteID[3] = 814; + pSpriteID[0] = SPRITE_811; + pSpriteID[1] = SPRITE_812; + pSpriteID[2] = SPRITE_813; + pSpriteID[3] = SPRITE_814; pRandom = rand() % 4; v6 = PID_ID(EvtTargetObj); if ( PID_TYPE(EvtTargetObj) == OBJECT_Decoration) @@ -137,7 +137,7 @@ Vec3_int_::Rotate(pDepth, sRotX, sRotY, v, &pOut.x, &pOut.z, &pOut.y); SpriteObject::sub_42F7EB_DropItemAt(pSpriteID[pRandom], pOut.x, pOut.z, pOut.y, 0, 1, 0, 48, 0); - pSpellObject.stru_24.Reset(); + pSpellObject.containing_item.Reset(); pSpellObject.spell_skill = 0; pSpellObject.spell_level = 0; pSpellObject.spell_id = 0;