mm7: mm7_5.cpp comparison

comparison mm7_5.cpp @ 322:ce39b96acf5c

Killing friendly peasants subs

author	Nomad
date	Wed, 20 Feb 2013 04:36:14 +0200
parents	15decc249a94
children	8e23edf57e27

comparison

equal deleted inserted replaced

-:15decc249a94
+:ce39b96acf5c
 return;
 }
 if ( pMonster->sCurrentHP > 0 )
 {
 Actor::_4030AD(uActorID_Monster_, a1, 0);
-Actor::_43AC45(uActorID_Monster_, 1);
+Actor::AggroSurroundingPeasants(uActorID_Monster_, 1);
 if ( bShowDamage )
 {
 v50 = uDamageAmount;
 pMonsterName = (char *)pMonster;
 pPlayerName = player->pName;
 pDecalBuilder->AddBloodsplat(v39, v38, v37, 1.0, 0.0, 0.0, *(float *)&pPlayerName, 0, 0);
 }
 }
 }
 Actor::Die(uActorID_Monster_);
-Actor::_438CF3(uActorID_Monster_);
+Actor::ApplyFineForKillingPeasant(uActorID_Monster_);
-Actor::_43AC45(uActorID_Monster_, 1);
+Actor::AggroSurroundingPeasants(uActorID_Monster_, 1);
 if ( pMonster->pMonsterInfo.uExp )
 sub_4269A2_GivePartyExp(pMonsterStats->pInfos[pMonster->pMonsterInfo.uID].uExp);
 v40 = SPEECH_51;
 if ( rand() % 100 < 20 )
 v40 = ((signed int)pMonster->pMonsterInfo.uHP >= 100) + 1;
 v7->sCurrentHP -= v26;
 if ( v26 )
 {
 if ( v7->sCurrentHP >= 1 )
 {
-Actor::_4030AD(uActorID, 8 * a4 | 4, 0);
+Actor::_4030AD(uActorID, 8 * a4 | OBJECT_Player, 0);
-Actor::_43AC45(uActorID, 1);
+Actor::AggroSurroundingPeasants(uActorID, 1);
 }
 else
 {
 if ( pMonsterStats->pInfos[v7->pMonsterInfo.uID].bQuestMonster & 1 )
 {
 pDecalBuilder->AddBloodsplat(v33, v32, v30, 1.0, 0.0, 0.0, v28, 0, 0);
 }
 }
 }
 Actor::Die(uActorID);
-Actor::_438CF3(uActorID);
+Actor::ApplyFineForKillingPeasant(uActorID);
-Actor::_43AC45(uActorID, 1);
+Actor::AggroSurroundingPeasants(uActorID, 1);
 if ( v7->pMonsterInfo.uExp )
 sub_4269A2_GivePartyExp(pMonsterStats->pInfos[v7->pMonsterInfo.uID].uExp);
 v34 = SPEECH_51;
 if ( rand() % 100 < 20 )
 v34 = ((signed int)v7->pMonsterInfo.uHP >= 100) + 1;
 v44->sCurrentHP -= v56;
 if ( v56 )
 {
 if ( v44->sCurrentHP >= 1 )
 {
-Actor::_4030AD(uActorID, 8 * a4 | 4, 0);
+Actor::_4030AD(uActorID, 8 * a4 | OBJECT_Player, 0);
-Actor::_43AC45(uActorID, 1);
+Actor::AggroSurroundingPeasants(uActorID, 1);
 }
 else
 {
 if ( pMonsterStats->pInfos[v44->pMonsterInfo.uID].bQuestMonster & 1 )
 {
 pDecalBuilder->AddBloodsplat(v63, v62, v60, 1.0, 0.0, 0.0, v58, 0, 0);
 }
 }
 }
 Actor::Die(uActorID);
-Actor::_438CF3(uActorID);
+Actor::ApplyFineForKillingPeasant(uActorID);
-Actor::_43AC45(uActorID, 1);
+Actor::AggroSurroundingPeasants(uActorID, 1);
 if ( v44->pMonsterInfo.uExp )
 sub_4269A2_GivePartyExp(pMonsterStats->pInfos[v44->pMonsterInfo.uID].uExp);
 v64 = SPEECH_51;
 if ( rand() % 100 < 20 )
 v64 = ((signed int)v44->pMonsterInfo.uHP >= 100) + 1;
 }
 }
 }
 //----- (0043B1B0) --------------------------------------------------------
-__int16 __fastcall sub_43B1B0(signed int a1, unsigned int a2, Vec3_int_ *pVelocity, signed int a4)
+void sub_43B1B0(signed int a1, unsigned int a2, Vec3_int_ *pVelocity, signed int a4)
 {
 int v4; // ebx@1
 LayingItem *v5; // eax@2
 bool v6; // eax@3
 Actor *v7; // esi@4
 {
 if ( v7->sCurrentHP > 0 )
 Actor::_4030AD(uActorID, v17, 0);
 else
 Actor::Die(uActorID);
-Actor::_43AC45(uActorID, 0);
+Actor::AggroSurroundingPeasants(uActorID, 0);
 v18 = 20 * v14 / (signed int)v7->pMonsterInfo.uHP;
 if ( 20 * v14 / (signed int)v7->pMonsterInfo.uHP > 10 )
 v18 = 10;
 if ( !MonsterStats::BelongsToSupertype(v7->pMonsterInfo.uID, MONSTER_SUPERTYPE_TREANT) )
 {
 pVelocity->z = (unsigned __int64)(v18 * (signed __int64)pVelocity->z) >> 16;
 v7->vVelocity.x = 50 * LOWORD(pVelocity->x);
 v7->vVelocity.y = 50 * LOWORD(pVelocity->y);
 v7->vVelocity.z = 50 * LOWORD(pVelocity->z);
 }
-LOWORD(v6) = Actor::AddBloodsplatOnDamageOverlay(uActorID, 1, v14);
+Actor::AddBloodsplatOnDamageOverlay(uActorID, 1, v14);
 }
 else
 {
-LOWORD(v6) = Actor::_4030AD(uActorID, v17, 0);
+Actor::_4030AD(uActorID, v17, 0);
 }
-return v6;
+return;
 }
 v13 = v7->pMonsterInfo.uSpell2ID;
 }
 v12 = LOBYTE(pSpellStats->pInfos[v13].uSchool);
 goto LABEL_30;
 v12 = v8->pMonsterInfo.uAttack1Type;
 goto LABEL_30;
 }
 }
 }
-return v6;
 }
 //----- (0043BCA7) --------------------------------------------------------
 int __cdecl CharacterUI_LoadPaperdollTextures()
 {
 while ( v5 < this->uActorQueueSize );
 }
 }
 //----- (004065B0) --------------------------------------------------------
-__int16 stru262_TurnBased::_4065B0()
+void stru262_TurnBased::_4065B0()
 {
 stru262_TurnBased *v1; // esi@1
 signed int v2; // eax@1
 int v3; // ebx@6
 int v4; // edi@7
 }
 v5 = 0;
 if ( v1->uActorQueueSize > 0 )
 {
 do
-LOWORD(v2) = v1->_406648(v5++);
+v1->_406648(v5++);
 while ( (signed int)v5 < v1->uActorQueueSize );
 }
-return v2;
 }
 //----- (00406648) --------------------------------------------------------
-__int16 stru262_TurnBased::_406648(unsigned int a2)
+void stru262_TurnBased::_406648(unsigned int a2)
 {
 TurnBased_QueueElem *v1; // ecx@1
 int v3; // eax@1
 unsigned int v4; // ebx@2
 Actor *v5; // esi@2
 v15 = v4;
 v23 = &a4;
 v16 = a2a;
 if ( !(v14 % 2) )
 {
-LOWORD(v3) = Actor::_402F87(v4, a2a, &a4);
+Actor::_402F87(v4, a2a, &a4);
-return v3;
+return;
 }
 v21 = 64;
 LABEL_26:
-LOWORD(v3) = Actor::_403EB6(v15, v16, v21, v23);
+Actor::_403EB6(v15, v16, v21, v23);
-return v3;
+return;
 }
 LABEL_21:
 v5->uCurrentActionTime = 0;
 v5->uCurrentActionLength = 0;
 v5->uAIState = Dead;
-return pActors[v4].UpdateAnimation();
+pActors[v4].UpdateAnimation();
+return;
 }
 v24 = v5->pMonsterInfo.uSpellSkillAndMastery2;
 v22 = 3;
 v17 = v5->pMonsterInfo.uSpell2ID;
 }
 }
 }
 }
 }
 }
-return v3;
 }
 // 50FE08: using guessed type stru298 stru_50FE08;
 //----- (0040680F) --------------------------------------------------------
 __int16 stru262_TurnBased::_40680F(int a2)
 actor->pMonsterInfo.uHostilityType = MonsterInfo::Hostility_Friendly;
 if (!v8 || v7)
 if (!v6 || v5)
-if (actor->_438B9B())
+if (actor->IsPeasant())
 BYTE2(actor->uAttributes) &= 0xF7u;
 BYTE2(actor->uAttributes) &= 0x7Fu;
 if (BYTE2(actor->uAttributes) & 0x40)
 Actor::_4031C1_update_job(i, pParty->uCurrentHour, 1);

Mercurial > mm7

comparison mm7_5.cpp @ 322:ce39b96acf5c