Mercurial > mm7

comparison mm7_5.cpp @ 860:8fc2f035abc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* AI function renames * more PID replaces
author zipi
date Sun, 31 Mar 2013 12:39:29 +0100
parents 8fafe3645f36
children fea81e031484
comparison
equal deleted inserted replaced
859:48c230c37d74 860:8fc2f035abc0
5379 v7->sCurrentHP -= v26; 5379 v7->sCurrentHP -= v26;
5380 if ( v26 ) 5380 if ( v26 )
5381 { 5381 {
5382 if ( v7->sCurrentHP >= 1 ) 5382 if ( v7->sCurrentHP >= 1 )
5383 { 5383 {
5384 Actor::_4030AD(uActorID, 8 * a4 | OBJECT_Player, 0); 5384 Actor::_4030AD(uActorID, PID(a4,OBJECT_Player), 0);
5385 Actor::AggroSurroundingPeasants(uActorID, 1); 5385 Actor::AggroSurroundingPeasants(uActorID, 1);
5386 } 5386 }
5387 else 5387 else
5388 { 5388 {
5389 if ( pMonsterStats->pInfos[v7->pMonsterInfo.uID].bQuestMonster & 1 ) 5389 if ( pMonsterStats->pInfos[v7->pMonsterInfo.uID].bQuestMonster & 1 )
5565 v44->sCurrentHP -= v56; 5565 v44->sCurrentHP -= v56;
5566 if ( v56 ) 5566 if ( v56 )
5567 { 5567 {
5568 if ( v44->sCurrentHP >= 1 ) 5568 if ( v44->sCurrentHP >= 1 )
5569 { 5569 {
5570 Actor::_4030AD(uActorID, 8 * a4 | OBJECT_Player, 0); 5570 Actor::_4030AD(uActorID, PID(a4,OBJECT_Player), 0);
5571 Actor::AggroSurroundingPeasants(uActorID, 1); 5571 Actor::AggroSurroundingPeasants(uActorID, 1);
5572 } 5572 }
5573 else 5573 else
5574 { 5574 {
5575 if ( pMonsterStats->pInfos[v44->pMonsterInfo.uID].bQuestMonster & 1 ) 5575 if ( pMonsterStats->pInfos[v44->pMonsterInfo.uID].bQuestMonster & 1 )
7337 { 7337 {
7338 v24 = v5->pMonsterInfo.uSpellSkillAndMastery1; 7338 v24 = v5->pMonsterInfo.uSpellSkillAndMastery1;
7339 v22 = 2; 7339 v22 = 2;
7340 v17 = v5->pMonsterInfo.uSpell1ID; 7340 v17 = v5->pMonsterInfo.uSpell1ID;
7341 } 7341 }
7342 Actor::_404AC7(v4, &a4, v17, v22, v24); 7342 Actor::SpellAttack(v4, &a4, v17, v22, v24);
7343 LABEL_25: 7343 LABEL_25:
7344 v16 = a2a; 7344 v16 = a2a;
7345 v23 = &a4; 7345 v23 = &a4;
7346 v21 = 0; 7346 v21 = 0;
7347 v15 = v4; 7347 v15 = v4;
7353 else 7353 else
7354 { 7354 {
7355 v18 = v5->pMonsterInfo.uMissleAttack1Type; 7355 v18 = v5->pMonsterInfo.uMissleAttack1Type;
7356 v25 = 0; 7356 v25 = 0;
7357 } 7357 }
7358 Actor::_404874(v4, &a4, v18, v25); 7358 Actor::RangedAttack(v4, &a4, v18, v25);
7359 goto LABEL_25; 7359 goto LABEL_25;
7360 } 7360 }
7361 } 7361 }
7362 } 7362 }
7363 } 7363 }
7825 { 7825 {
7826 Actor::AI_Stand(uActorID, a2a, 0x20u, 0); 7826 Actor::AI_Stand(uActorID, a2a, 0x20u, 0);
7827 goto LABEL_25; 7827 goto LABEL_25;
7828 } 7828 }
7829 LABEL_24: 7829 LABEL_24:
7830 Actor::_402968(v16, v15, v21, v23); 7830 Actor::Flee(v16, v15, v21, v23);
7831 LABEL_25: 7831 LABEL_25:
7832 v17 = v29; 7832 v17 = v29;
7833 v29->field_C = 4; 7833 v29->field_C = 4;
7834 LABEL_60: 7834 LABEL_60:
7835 v17->uActionLength = v4->uCurrentActionLength; 7835 v17->uActionLength = v4->uCurrentActionLength;
7842 if ( (double)(signed int)v28 < 307.2 ) 7842 if ( (double)(signed int)v28 < 307.2 )
7843 return 0; 7843 return 0;
7844 if ( (signed int)v11 < 5120 ) 7844 if ( (signed int)v11 < 5120 )
7845 { 7845 {
7846 if ( v4->pMonsterInfo.uMissleAttack1Type && (signed int)v11 < 1024 ) 7846 if ( v4->pMonsterInfo.uMissleAttack1Type && (signed int)v11 < 1024 )
7847 Actor::_402AD7(uActorID, a2a, uActorID, 32, &pDir); 7847 Actor::Pursue1(uActorID, a2a, uActorID, 32, &pDir);
7848 else 7848 else
7849 Actor::_40281C(uActorID, a2a, 32, &pDir, 307); 7849 Actor::Pursue2(uActorID, a2a, 32, &pDir, 307);
7850 goto LABEL_59; 7850 goto LABEL_59;
7851 } 7851 }
7852 LABEL_46: 7852 LABEL_46:
7853 if ( !v4->pMonsterInfo.uMovementType ) 7853 if ( !v4->pMonsterInfo.uMovementType )
7854 { 7854 {