Mercurial > mm7

comparison mm7_4.cpp @ 1362:d6cf8ead9242

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Condition checking functions slightly renamed, some final changes in Player::SetCondition
author Grumpy7
date Mon, 15 Jul 2013 00:42:50 +0200
parents b3ac17fd12de
children 5572e7b02f45
comparison
equal deleted inserted replaced
1361:b3ac17fd12de 1362:d6cf8ead9242
1615 pParty->pPlayers[i].sHealth = pParty->pPlayers[i].sHealth / (pParty->days_played_without_rest + 1) + 1; 1615 pParty->pPlayers[i].sHealth = pParty->pPlayers[i].sHealth / (pParty->days_played_without_rest + 1) + 1;
1616 1616
1617 if (pParty->days_played_without_rest > 3) 1617 if (pParty->days_played_without_rest > 3)
1618 for (uint i = 0; i < 4; ++i) 1618 for (uint i = 0; i < 4; ++i)
1619 { 1619 {
1620 auto player = pParty->pPlayers + i; 1620 Player* player = pParty->pPlayers + i;
1621 1621
1622 player->Zero(); 1622 player->Zero();
1623 1623
1624 if (!player->Pertified() && !player->Eradicated() && !player->Dead()) 1624 if (!player->IsPertified() && !player->IsEradicated() && !player->IsDead())
1625 { 1625 {
1626 if (rand() % 100 < 5 * pParty->days_played_without_rest) 1626 if (rand() % 100 < 5 * pParty->days_played_without_rest)
1627 player->SetCondDeadWithBlockCheck(0); 1627 player->SetCondDeadWithBlockCheck(0);
1628 if (rand() % 100 < 10 * pParty->days_played_without_rest) 1628 if (rand() % 100 < 10 * pParty->days_played_without_rest)
1629 player->SetCondInsaneWithBlockCheck(0); 1629 player->SetCondInsaneWithBlockCheck(0);