Mercurial > might-and-magic-trilogy

comparison Indoor.cpp @ 49:25fabc49627b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 23 Oct 2012 17:34:20 +0600
parents bcc051713d20
children fde5c5acb66e
comparison
equal deleted inserted replaced
48:6a62c4005f0e 49:25fabc49627b
46 46
47 stru320 stru_F8AD28; // idb 47 stru320 stru_F8AD28; // idb
48 stru337 stru_F81018; 48 stru337 stru_F81018;
49 stru167_wrap array_5118E8; 49 stru167_wrap array_5118E8;
50 stru170_stru2 stru_F8A590; 50 stru170_stru2 stru_F8A590;
51 stru170 *pStru170; // idb 51 stru170 *pStru170 = new stru170; // idb
52 stru141 stru_721530; 52 stru141 stru_721530;
53 stru352 stru_F83B80[480]; 53 stru352 stru_F83B80[480];
54 54
55 55
56 56
121 v8 = &pIndoor->pSectors[pStru170->pSectorIDs_toDrawDecorationsFrom[v6]]; 121 v8 = &pIndoor->pSectors[pStru170->pSectorIDs_toDrawDecorationsFrom[v6]];
122 v9 = v8->pDecorationIDs; 122 v9 = v8->pDecorationIDs;
123 if ( v8->uNumDecorations > 0 ) 123 if ( v8->uNumDecorations > 0 )
124 { 124 {
125 do 125 do
126 PrepareDecorationsRenderList_BLV((signed __int16)v9[v12++], v7); 126 PrepareDecorationsRenderList_BLV(v9[v12++], v7);
127 while ( v12 < v8->uNumDecorations ); 127 while ( v12 < v8->uNumDecorations );
128 } 128 }
129 v6 = i + 1; 129 v6 = i + 1;
130 } 130 }
131 MessWithBillboards_BLV(); 131 MessWithBillboards_BLV();
132 pGame->PushStru165s(); 132 pGame->PrepareBloodsplats();
133 } 133 }
134 134
135 135
136 136
137 //----- (004407D9) -------------------------------------------------------- 137 //----- (004407D9) --------------------------------------------------------
4165 v0->vVelocity.z = 0; 4165 v0->vVelocity.z = 0;
4166 v0->vVelocity.y = 0; 4166 v0->vVelocity.y = 0;
4167 v0->vVelocity.x = 0; 4167 v0->vVelocity.x = 0;
4168 if ( BYTE2(v17[v18].uAttributes) & 0x40 ) 4168 if ( BYTE2(v17[v18].uAttributes) & 0x40 )
4169 { 4169 {
4170 if ( v0->uAIState == 5 ) 4170 if (v0->uAIState == Dead)
4171 v0->uAIState = 11; 4171 v0->uAIState = Removed;
4172 } 4172 }
4173 LABEL_123: 4173 LABEL_123:
4174 ++v63; 4174 ++v63;
4175 if ( (signed int)v63 >= (signed int)uNumActors ) 4175 if ( (signed int)v63 >= (signed int)uNumActors )
4176 return; 4176 return;
4257 v32 = v58 + v0->vPosition.z; 4257 v32 = v58 + v0->vPosition.z;
4258 } 4258 }
4259 v33 = _46ED1B_collide_against_floor(v30, v31, v32, &stru_721530.uSectorID, &v60); 4259 v33 = _46ED1B_collide_against_floor(v30, v31, v32, &stru_721530.uSectorID, &v60);
4260 v34 = pIndoor->pFaces[v60].uAttributes; 4260 v34 = pIndoor->pFaces[v60].uAttributes;
4261 v35 = v34 & 0x400000; 4261 v35 = v34 & 0x400000;
4262 if ( v35 && v0->uAIState == 5 ) 4262 if (v35 && v0->uAIState == Dead)
4263 { 4263 {
4264 v0->uAIState = 11; 4264 v0->uAIState = Removed;
4265 goto LABEL_120; 4265 goto LABEL_120;
4266 } 4266 }
4267 if ( v59 != v22 || v62 != v22 || v35 == v22 ) 4267 if ( v59 != v22 || v62 != v22 || v35 == v22 )
4268 { 4268 {
4269 if ( v33 == -30000 ) 4269 if ( v33 == -30000 )