Mercurial > mm7

comparison mm7_3.cpp @ 578:fdea951756f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 05 Mar 2013 10:45:40 +0600
parents 7e8f5124056c 9caf59edb1ee
children a295c9f956d1
comparison
equal deleted inserted replaced
577:7e8f5124056c 578:fdea951756f9
123 { 123 {
124 while ( 1 ) 124 while ( 1 )
125 { 125 {
126 v9 = &pIndoor->pSectors[v33[result]]; 126 v9 = &pIndoor->pSectors[v33[result]];
127 v10 = 0; 127 v10 = 0;
128 v32 = v9->uNumFloors + v9->field_C + v9->field_14; 128 v32 = v9->uNumFloors + v9->uNumWalls + v9->uNumCeilings;
129 v26 = 0; 129 v26 = 0;
130 if ( v32 > 0 ) 130 if ( v32 > 0 )
131 break; 131 break;
132 LABEL_46: 132 LABEL_46:
133 result = v29++ + 1; 133 result = v29++ + 1;
1524 signed int v5; // ebx@1 1524 signed int v5; // ebx@1
1525 int result; // eax@1 1525 int result; // eax@1
1526 int v7; // [sp+10h] [bp-8h]@1 1526 int v7; // [sp+10h] [bp-8h]@1
1527 signed int v8; // [sp+14h] [bp-4h]@1 1527 signed int v8; // [sp+14h] [bp-4h]@1
1528 1528
1529 __debugbreak();
1530 v5 = x - 2; 1529 v5 = x - 2;
1531 v7 = x; 1530 v7 = x;
1532 v8 = y; 1531 v8 = y;
1533 *pSectorID = pIndoor->GetSector(x - 2, y, z + 40); 1532 *pSectorID = pIndoor->GetSector(x - 2, y, z + 40);
1534 result = _46ED1B_collide_against_floor(v5, v8, z + 40, pSectorID, pFaceID); 1533 result = _46ED1B_collide_against_floor(v5, v8, z + 40, pSectorID, pFaceID);
1648 v71 = 0; 1647 v71 = 0;
1649 bJumping = 0; 1648 bJumping = 0;
1650 v80 = _46ED1B_collide_against_floor(new_party_x, new_party_y, party_z + 40, &uSectorID, &uFaceID); 1649 v80 = _46ED1B_collide_against_floor(new_party_x, new_party_y, party_z + 40, &uSectorID, &uFaceID);
1651 if ( pParty->bFlying ) 1650 if ( pParty->bFlying )
1652 { 1651 {
1653 pParty->bFlying = 0; 1652 pParty->bFlying = false;
1654 __debugbreak();
1655 if (pParty->FlyActive()) 1653 if (pParty->FlyActive())
1656 stru_5E4C90._decor_events[20 * pParty->pPartyBuffs[7].uOverlayID + 119] |= 1u;// 005E4D58 pOtherOverlayList [negindexing] 1654 pOtherOverlayList->pOverlays[pParty->pPartyBuffs[PARTY_BUFF_FLY].uOverlayID - 1].field_E |= 1;
1655 //stru_5E4C90._decor_events[20 * pParty->pPartyBuffs[PARTY_BUFF_FLY].uOverlayID + 119] |= 1u;// 005E4D58 pOtherOverlayList [negindexing]
1657 } 1656 }
1658 if ( v80 == -30000 ) 1657 if ( v80 == -30000 )
1659 { 1658 {
1660 v80 = _47272C_collide_agains_some_secotors_floors(new_party_x, new_party_y, party_z + 40, &uSectorID, &uFaceID); 1659 v80 = _47272C_collide_agains_some_secotors_floors(new_party_x, new_party_y, party_z + 40, &uSectorID, &uFaceID);
1661 if ( v80 == -30000 ) 1660 if ( v80 == -30000 )