Mercurial > mm7
diff Chest.cpp @ 536:55d0794848d1
Слияние
author | Ritor1 |
---|---|
date | Sat, 02 Mar 2013 00:24:27 +0600 |
parents | 426682cf4a75 cb0ad52d6a26 |
children | db4631a484ae |
line wrap: on
line diff
--- a/Chest.cpp Sat Mar 02 00:24:12 2013 +0600 +++ b/Chest.cpp Sat Mar 02 00:24:27 2013 +0600 @@ -61,7 +61,7 @@ signed int v25; // ecx@28 char *v26; // edx@29 unsigned __int16 v27; // ax@32 - //LayingItem a1; // [sp+14h] [bp-B0h]@28 + //SpriteObject a1; // [sp+14h] [bp-B0h]@28 int v29; // [sp+84h] [bp-40h]@16 int v30; // [sp+88h] [bp-3Ch]@16 int v31; // [sp+8Ch] [bp-38h]@16 @@ -169,8 +169,8 @@ v23 = (unsigned int *)(&v29 + v35); sub_42F7EB_DropItemAt(*v23, pOut.x, pOut.z, pOut.y, 0, 1, 0, 0x30u, 0); - LayingItem a1; // [sp+14h] [bp-B0h]@28 - //LayingItem::LayingItem(&a1); + SpriteObject a1; // [sp+14h] [bp-B0h]@28 + //SpriteObject::SpriteObject(&a1); a1.stru_24.Reset(); v24 = *(short *)v23; @@ -179,7 +179,7 @@ a1.field_4C = 0; a1.field_48 = 0; a1.field_54 = 0; - a1.uItemType = v24; + a1.uType = v24; if ( (signed int)pObjectList->uNumObjects <= 0 ) { LABEL_32: