Mercurial > mm7

comparison mm7_5.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 8fafe3645f36
children 8fc2f035abc0
comparison
equal deleted inserted replaced
856:8638d5b2e46d 857:e4bd2a0bf08b
5319 goto LABEL_26; 5319 goto LABEL_26;
5320 } 5320 }
5321 } 5321 }
5322 v17 = (SoundID)a4; 5322 v17 = (SoundID)a4;
5323 LABEL_26: 5323 LABEL_26:
5324 pAudioPlayer->PlaySound(v17, (8 * a4 + 80) | 4, 0, -1, 0, 0, 0, 0); 5324 pAudioPlayer->PlaySound(v17, PID(a4 + 80,OBJECT_Player), 0, -1, 0, 0, 0, 0);
5325 v18 = Actor::_43B3E0_CalcDamage(v7, v74); 5325 v18 = Actor::_43B3E0_CalcDamage(v7, v74);
5326 v19 = HIDWORD(v7->pActorBuffs[3].uExpireTime) == 0; 5326 v19 = HIDWORD(v7->pActorBuffs[3].uExpireTime) == 0;
5327 v20 = SHIDWORD(v7->pActorBuffs[3].uExpireTime) < 0; 5327 v20 = SHIDWORD(v7->pActorBuffs[3].uExpireTime) < 0;
5328 v77 = v18; 5328 v77 = v18;
5329 if ( !v20 && (!(v20 | v19) || LODWORD(v7->pActorBuffs[3].uExpireTime) > 0) ) 5329 if ( !v20 && (!(v20 | v19) || LODWORD(v7->pActorBuffs[3].uExpireTime) > 0) )
6777 LABEL_11: 6777 LABEL_11:
6778 if ( v17 == v1->uActorQueueSize ) 6778 if ( v17 == v1->uActorQueueSize )
6779 { 6779 {
6780 *(int *)v4 = 100; 6780 *(int *)v4 = 100;
6781 v6 = 8 * v19; 6781 v6 = 8 * v19;
6782 LOBYTE(v6) = 8 * v19 | 4; 6782 LOBYTE(v6) = PID(v19,OBJECT_Player);
6783 *((int *)v4 + 2) = v2; 6783 *((int *)v4 + 2) = v2;
6784 *((int *)v4 - 1) = v6; 6784 *((int *)v4 - 1) = v6;
6785 *((int *)v4 + 1) = v2; 6785 *((int *)v4 + 1) = v2;
6786 ++v3; 6786 ++v3;
6787 v4 += 16; 6787 v4 += 16;
6813 if ( v18 == v1->uActorQueueSize ) 6813 if ( v18 == v1->uActorQueueSize )
6814 { 6814 {
6815 v9 = ai_near_actors_ids[v20]; 6815 v9 = ai_near_actors_ids[v20];
6816 *(int *)v7 = 1; 6816 *(int *)v7 = 1;
6817 *((int *)v7 + 2) = v2; 6817 *((int *)v7 + 2) = v2;
6818 *((int *)v7 - 1) = 8 * v9 | 3; 6818 *((int *)v7 - 1) = PID(v9,OBJECT_Actor);
6819 *((int *)v7 + 1) = v2; 6819 *((int *)v7 + 1) = v2;
6820 ++v3; 6820 ++v3;
6821 v7 += 16; 6821 v7 += 16;
6822 } 6822 }
6823 ++v20; 6823 ++v20;
7407 v6 = (unsigned int *)&ai_near_actors_targets_pid[(int)v4]; 7407 v6 = (unsigned int *)&ai_near_actors_targets_pid[(int)v4];
7408 Actor::_SelectTarget((unsigned int)v4, &ai_near_actors_targets_pid[(int)v4], true); 7408 Actor::_SelectTarget((unsigned int)v4, &ai_near_actors_targets_pid[(int)v4], true);
7409 if ( v5->pMonsterInfo.uHostilityType && !*v6 ) 7409 if ( v5->pMonsterInfo.uHostilityType && !*v6 )
7410 v5->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly; 7410 v5->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
7411 v22 = *v6; 7411 v22 = *v6;
7412 v7 = Actor::GetDirectionInfo(8 * (int)v4 | 3, *v6, &a3, 0); 7412 v7 = Actor::GetDirectionInfo(PID((int)v4,OBJECT_Actor), *v6, &a3, 0);
7413 v8 = v5->uActorRadius; 7413 v8 = v5->uActorRadius;
7414 memcpy(&a3, v7, sizeof(a3)); 7414 memcpy(&a3, v7, sizeof(a3));
7415 memcpy(&v18, &a3, sizeof(v18)); 7415 memcpy(&v18, &a3, sizeof(v18));
7416 v9 = a3.uDistance - v8; 7416 v9 = a3.uDistance - v8;
7417 v20 = a3.uDistance - v8; 7417 v20 = a3.uDistance - v8;