Mercurial > mm7

comparison mm7_4.cpp @ 849:8fafe3645f36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* PID replaces * Actor::GetDirectionInfo cleaning
author zipi
date Sun, 31 Mar 2013 11:46:28 +0100
parents ceef50611567
children 7fcbc83557b9
comparison
equal deleted inserted replaced
848:ceef50611567 849:8fafe3645f36
131 v8 = v6; 131 v8 = v6;
132 v6 = v5; 132 v6 = v5;
133 v5 = v8; 133 v5 = v8;
134 } 134 }
135 if ( (signed int)(((unsigned int)(11 * v5) >> 5) + (v6 >> 2) + v4) < v2 ) 135 if ( (signed int)(((unsigned int)(11 * v5) >> 5) + (v6 >> 2) + v4) < v2 )
136 EventProcessor(v1->field_16_event_id, 8 * i | 5, 1); 136 EventProcessor(v1->field_16_event_id, PID(i,OBJECT_Decoration), 1);
137 } 137 }
138 if ( v1->field_2 & 2 ) 138 if ( v1->field_2 & 2 )
139 { 139 {
140 v37 = 0; 140 v37 = 0;
141 if ( (signed int)uNumActors > 0 ) 141 if ( (signed int)uNumActors > 0 )
975 v13 = 0; 975 v13 = 0;
976 if ( v13 < stru_721530.field_7C ) 976 if ( v13 < stru_721530.field_7C )
977 { 977 {
978 stru_721530.field_7C = v13; 978 stru_721530.field_7C = v13;
979 v14 = 8 * v16; 979 v14 = 8 * v16;
980 LOBYTE(v14) = 8 * v16 | 3; 980 LOBYTE(v14) = PID(v16,OBJECT_Actor);
981 stru_721530.uFaceID = v14; 981 stru_721530.uFaceID = v14;
982 } 982 }
983 result = 1; 983 result = 1;
984 } 984 }
985 return result; 985 return result;
2131 v16 = *v14; 2131 v16 = *v14;
2132 a1.vPosition.x = pActors[v16].vPosition.x; 2132 a1.vPosition.x = pActors[v16].vPosition.x;
2133 v17 = pActors[v16].vPosition.y; 2133 v17 = pActors[v16].vPosition.y;
2134 a1.vPosition.z = pActors[v16].vPosition.z; 2134 a1.vPosition.z = pActors[v16].vPosition.z;
2135 v18 = 8 * v15; 2135 v18 = 8 * v15;
2136 LOBYTE(v18) = 8 * v15 | 3; 2136 LOBYTE(v18) = PID(v15,OBJECT_Actor);
2137 a1.vPosition.y = v17; 2137 a1.vPosition.y = v17;
2138 a1.spell_target_pid = v18; 2138 a1.spell_target_pid = v18;
2139 v19 = a1.Create(0, 0, 0, 0); 2139 v19 = a1.Create(0, 0, 0, 0);
2140 DamageMonsterFromParty(8 * v19 | 2, *v14, &a3); 2140 DamageMonsterFromParty(PID(v19,OBJECT_Item), *v14, &a3);
2141 ++v9; 2141 ++v9;
2142 } 2142 }
2143 while ( v9 < v13 ); 2143 while ( v9 < v13 );
2144 } 2144 }
2145 } 2145 }
5519 v3 = v1->uBitmapID; 5519 v3 = v1->uBitmapID;
5520 v4 = v1->uBitmapID; 5520 v4 = v1->uBitmapID;
5521 v68 = v2; 5521 v68 = v2;
5522 v5 = (Texture *)(v4 != -1 ? (int)&pBitmaps_LOD->pTextures[v3] : 0); 5522 v5 = (Texture *)(v4 != -1 ? (int)&pBitmaps_LOD->pTextures[v3] : 0);
5523 v6 = 8 * uFaceID; 5523 v6 = 8 * uFaceID;
5524 LOBYTE(v6) = 8 * uFaceID | 6; 5524 LOBYTE(v6) = PID(uFaceID,OBJECT_BModel);
5525 stru_F8AD28.field_0 = v6; 5525 stru_F8AD28.field_0 = v6;
5526 stru_F8AD28.plane_4.vNormal.x = v1->pFacePlane_old.vNormal.x; 5526 stru_F8AD28.plane_4.vNormal.x = v1->pFacePlane_old.vNormal.x;
5527 stru_F8AD28.plane_4.vNormal.y = v1->pFacePlane_old.vNormal.y; 5527 stru_F8AD28.plane_4.vNormal.y = v1->pFacePlane_old.vNormal.y;
5528 stru_F8AD28.plane_4.vNormal.z = v1->pFacePlane_old.vNormal.z; 5528 stru_F8AD28.plane_4.vNormal.z = v1->pFacePlane_old.vNormal.z;
5529 stru_F8AD28.plane_4.dist = v1->pFacePlane_old.dist; 5529 stru_F8AD28.plane_4.dist = v1->pFacePlane_old.dist;