Mercurial > mm7
diff Indoor.cpp @ 788:f004c7ceb7bd
Слияние
| author | Ritor1 |
|---|---|
| date | Mon, 25 Mar 2013 02:21:14 +0600 |
| parents | 3a77fbf7d0b8 b27dd658ea77 |
| children | 346f7069676a |
line wrap: on
line diff
--- a/Indoor.cpp Mon Mar 25 02:20:57 2013 +0600 +++ b/Indoor.cpp Mon Mar 25 02:21:14 2013 +0600 @@ -571,7 +571,7 @@ pRenderer->DrawIndoorPolygon(uNumVerticesa, pFace, v27, v28, 8 * uFaceID | OBJECT_BModel, v17, 0); return; } - //v17 = 0xFFFFFFFF; + v17 = 0xFFFFFFFF; v23 = pFace->uBitmapID; goto LABEL_42; } @@ -3927,7 +3927,7 @@ if ( v1 == 11 || v1 == 19 || v1 == 17 || !v0->uMovementSpeed ) goto LABEL_123; uSectorID = v0->uSectorID; - v2 = _46ED1B_collide_against_floor(v0->vPosition.x, v0->vPosition.y, v0->vPosition.z, &uSectorID, &uFaceID); + v2 = collide_against_floor(v0->vPosition.x, v0->vPosition.y, v0->vPosition.z, &uSectorID, &uFaceID); v0->uSectorID = uSectorID; v3 = v0->pMonsterInfo.uFlying; v56 = v2; @@ -4129,7 +4129,7 @@ v58 = (unsigned __int64)(stru_721530.field_7C * (signed __int64)stru_721530.field_58.z) >> 16; v32 = v58 + v0->vPosition.z; } - v33 = _46ED1B_collide_against_floor(v30, v31, v32, &stru_721530.uSectorID, &uFaceID); + v33 = collide_against_floor(v30, v31, v32, &stru_721530.uSectorID, &uFaceID); v34 = pIndoor->pFaces[uFaceID].uAttributes; v35 = v34 & 0x400000; if (v35 && v0->uAIState == Dead)