Mercurial > mm7

comparison Actor.cpp @ 1827:0c75c3e7e436

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaned up part of party.cpp, renamed byte_AE3368 to playerAlreadyPicked + 3 vars after it, moved them to party.cpp, some player.cpp bugfixes
author Grumpy7
date Fri, 11 Oct 2013 05:49:39 +0200
parents 0f1543750bf8
children 35c1e4ff6ba7
comparison
equal deleted inserted replaced
1826:bdac32c645c5 1827:0c75c3e7e436
2036 if ( pParty->IsPartyEvil() ) 2036 if ( pParty->IsPartyEvil() )
2037 v3 = 1; 2037 v3 = 1;
2038 if ( v3 ) 2038 if ( v3 )
2039 { 2039 {
2040 LABEL_12: 2040 LABEL_12:
2041 pParty->uFine += 100 * (pMapStats->pInfos[uLevelMapStatsID]._steal_perm + pActors[v2].pMonsterInfo.uLevel + GetPartyReputation()); 2041 pParty->uFine += 100 * (pMapStats->pInfos[uLevelMapStatsID]._steal_perm + pActors[v2].pMonsterInfo.uLevel + pParty->GetPartyReputation());
2042 if ( pParty->uFine < 0 ) 2042 if ( pParty->uFine < 0 )
2043 pParty->uFine = 0; 2043 pParty->uFine = 0;
2044 if ( pParty->uFine > 4000000 ) 2044 if ( pParty->uFine > 4000000 )
2045 pParty->uFine = 4000000; 2045 pParty->uFine = 4000000;
2046 2046
4107 } 4107 }
4108 else 4108 else
4109 { 4109 {
4110 Actor::Die(i); 4110 Actor::Die(i);
4111 if ( pActor->pMonsterInfo.uExp ) 4111 if ( pActor->pMonsterInfo.uExp )
4112 GivePartyExp(pMonsterStats->pInfos[pActor->pMonsterInfo.uID].uExp); 4112 pParty->GivePartyExp(pMonsterStats->pInfos[pActor->pMonsterInfo.uID].uExp);
4113 } 4113 }
4114 } 4114 }
4115 } 4115 }
4116 } 4116 }
4117 for(int i = 1; i <= 4; i++) 4117 for(int i = 1; i <= 4; i++)
5284 } 5284 }
5285 Actor::Die(uActorID_Monster_); 5285 Actor::Die(uActorID_Monster_);
5286 Actor::ApplyFineForKillingPeasant(uActorID_Monster_); 5286 Actor::ApplyFineForKillingPeasant(uActorID_Monster_);
5287 Actor::AggroSurroundingPeasants(uActorID_Monster_, 1); 5287 Actor::AggroSurroundingPeasants(uActorID_Monster_, 1);
5288 if ( pMonster->pMonsterInfo.uExp ) 5288 if ( pMonster->pMonsterInfo.uExp )
5289 GivePartyExp(pMonsterStats->pInfos[pMonster->pMonsterInfo.uID].uExp); 5289 pParty->GivePartyExp(pMonsterStats->pInfos[pMonster->pMonsterInfo.uID].uExp);
5290 v40 = SPEECH_51; 5290 v40 = SPEECH_51;
5291 if ( rand() % 100 < 20 ) 5291 if ( rand() % 100 < 20 )
5292 v40 = ((signed int)pMonster->pMonsterInfo.uHP >= 100) + 1; 5292 v40 = ((signed int)pMonster->pMonsterInfo.uHP >= 100) + 1;
5293 player->PlaySound((PlayerSpeech)v40, 0); 5293 player->PlaySound((PlayerSpeech)v40, 0);
5294 v41 = 0; 5294 v41 = 0;