Mercurial > mm7

comparison mm7_2.cpp @ 857:e4bd2a0bf08b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 31 Mar 2013 16:52:23 +0600
parents cb0b3badc7f7 8fafe3645f36
children f4394e320312
comparison
equal deleted inserted replaced
856:8638d5b2e46d 857:e4bd2a0bf08b
4122 && (result = BLV_GetFloorLevel(v11, v14, v22, result, &uFaceID), result != -30000) 4122 && (result = BLV_GetFloorLevel(v11, v14, v22, result, &uFaceID), result != -30000)
4123 && (result = abs(result - v22), result <= 1024) ) 4123 && (result = abs(result - v22), result <= 1024) )
4124 { 4124 {
4125 if ( v20 == uNumActors ) 4125 if ( v20 == uNumActors )
4126 ++uNumActors; 4126 ++uNumActors;
4127 v6->uSummonerID = 8 * v17 | 4; 4127 v6->uSummonerID = PID(v17,OBJECT_Player);
4128 result = v6->pActorBuffs[2].Apply( 4128 result = v6->pActorBuffs[2].Apply(
4129 pParty->uTimePlayed + (signed __int64)((double)(a3 << 7) * 0.033333335), 4129 pParty->uTimePlayed + (signed __int64)((double)(a3 << 7) * 0.033333335),
4130 v16, 4130 v16,
4131 v17, 4131 v17,
4132 0, 4132 0,
11281 v131 = 0; 11281 v131 = 0;
11282 v130 = v114; 11282 v130 = v114;
11283 v115 = 8 * v153; 11283 v115 = 8 * v153;
11284 v129 = 0; 11284 v129 = 0;
11285 v128 = -1; 11285 v128 = -1;
11286 LOBYTE(v115) = 8 * v153 | 2; 11286 LOBYTE(v115) = PID(v153,OBJECT_Item);
11287 v127 = 0; 11287 v127 = 0;
11288 v126 = v115; 11288 v126 = v115;
11289 v116 = v143; 11289 v116 = v143;
11290 goto LABEL_269; 11290 goto LABEL_269;
11291 } 11291 }
11551 v72 = v153; 11551 v72 = v153;
11552 v132 = 0; 11552 v132 = 0;
11553 LABEL_132: 11553 LABEL_132:
11554 v73 = v2->vPosition.z; 11554 v73 = v2->vPosition.z;
11555 v74 = v2->vPosition.y; 11555 v74 = v2->vPosition.y;
11556 v75 = 8 * v72 | 2; 11556 v75 = PID(v72,OBJECT_Item);
11557 v2->vVelocity.z = v66; 11557 v2->vVelocity.z = v66;
11558 v2->vVelocity.y = v66; 11558 v2->vVelocity.y = v66;
11559 v76 = v2->vPosition.x; 11559 v76 = v2->vPosition.x;
11560 v2->vVelocity.x = v66; 11560 v2->vVelocity.x = v66;
11561 v2->uSpriteFrameID = v66; 11561 v2->uSpriteFrameID = v66;
11870 SpriteObject::OnInteraction(v153); 11870 SpriteObject::OnInteraction(v153);
11871 v37 = v2->vPosition.z; 11871 v37 = v2->vPosition.z;
11872 v2->vVelocity.z = 0; 11872 v2->vVelocity.z = 0;
11873 v38 = 8 * v153; 11873 v38 = 8 * v153;
11874 v39 = v2->vPosition.y; 11874 v39 = v2->vPosition.y;
11875 LOBYTE(v38) = 8 * v153 | 2; 11875 LOBYTE(v38) = PID(v153,OBJECT_Item);
11876 v2->vVelocity.y = 0; 11876 v2->vVelocity.y = 0;
11877 v2->vVelocity.x = 0; 11877 v2->vVelocity.x = 0;
11878 v40 = v2->vPosition.x; 11878 v40 = v2->vPosition.x;
11879 v2->uSpriteFrameID = 0; 11879 v2->uSpriteFrameID = 0;
11880 v147 = v38; 11880 v147 = v38;
11928 v100 = v2->field_61; 11928 v100 = v2->field_61;
11929 v101 = v2->vPosition.z; 11929 v101 = v2->vPosition.z;
11930 v2->uSpriteFrameID = v32; 11930 v2->uSpriteFrameID = v32;
11931 v102 = 8 * v153; 11931 v102 = 8 * v153;
11932 v103 = v2->vPosition.y; 11932 v103 = v2->vPosition.y;
11933 LOBYTE(v102) = 8 * v153 | 2; 11933 LOBYTE(v102) = PID(v153,OBJECT_Item);
11934 v2->vVelocity.x = v32; 11934 v2->vVelocity.x = v32;
11935 v2->vVelocity.y = v32; 11935 v2->vVelocity.y = v32;
11936 v104 = v2->vPosition.x; 11936 v104 = v2->vPosition.x;
11937 v2->vVelocity.z = v32; 11937 v2->vVelocity.z = v32;
11938 v149 = v102; 11938 v149 = v102;
12022 v131 = v9; 12022 v131 = v9;
12023 v130 = v9; 12023 v130 = v9;
12024 v13 = 8 * v153; 12024 v13 = 8 * v153;
12025 v129 = v9; 12025 v129 = v9;
12026 v128 = -1; 12026 v128 = -1;
12027 LOBYTE(v13) = 8 * v153 | 2; 12027 LOBYTE(v13) = PID(v153,OBJECT_Item);
12028 v127 = v9; 12028 v127 = v9;
12029 v126 = v13; 12029 v126 = v13;
12030 LABEL_28: 12030 LABEL_28:
12031 v125 = 8; 12031 v125 = 8;
12032 LABEL_29: 12032 LABEL_29: