Mercurial > mm7

comparison Party.cpp @ 1980:c1c74df0a33e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changing most of auto types to their actual types
author Grumpy7
date Wed, 30 Oct 2013 00:47:37 -0700
parents dd9d4b7c1199
children 84fa3c83d63f
comparison
equal deleted inserted replaced
1979:92dfa0cafbe3 1980:c1c74df0a33e
43 { 43 {
44 field_70A = 0; 44 field_70A = 0;
45 45
46 for (unsigned int i = 0; i < pNPCStats->uNumNewNPCs; ++i) 46 for (unsigned int i = 0; i < pNPCStats->uNumNewNPCs; ++i)
47 { 47 {
48 auto npc = pNPCStats->pNewNPCData + i; 48 NPCData* npc = &pNPCStats->pNewNPCData[i];
49 if (npc->Hired() && 49 if (npc->Hired() &&
50 (!pHirelings[0].pName || strcmp(npc->pName, pHirelings[0].pName))) 50 (!pHirelings[0].pName || strcmp(npc->pName, pHirelings[0].pName)))
51 { 51 {
52 if (!pHirelings[1].pName || strcmp(npc->pName, pHirelings[1].pName)) 52 if (!pHirelings[1].pName || strcmp(npc->pName, pHirelings[1].pName))
53 ++field_70A; 53 ++field_70A;
619 this->field_24 = 5; 619 this->field_24 = 5;
620 this->field_6FC = 0; 620 this->field_6FC = 0;
621 this->field_708 = 15; 621 this->field_708 = 15;
622 this->field_0 = 25; 622 this->field_0 = 25;
623 623
624 for (auto playerId = 0; playerId < 4; playerId++) 624 for (int playerId = 0; playerId < 4; playerId++)
625 { 625 {
626 for (auto buffId = 0; buffId < 24; buffId++) 626 for (int buffId = 0; buffId < 24; buffId++)
627 { 627 {
628 this->pPlayers[playerId].pPlayerBuffs[buffId].Reset(); 628 this->pPlayers[playerId].pPlayerBuffs[buffId].Reset();
629 } 629 }
630 } 630 }
631 for (auto buffId = 0; buffId < 20; buffId++) 631 for (int buffId = 0; buffId < 20; buffId++)
632 { 632 {
633 this->pPartyBuffs[buffId].Reset(); 633 this->pPartyBuffs[buffId].Reset();
634 } 634 }
635 } 635 }
636 636
642 for (int i = 0; i < 4; ++i) 642 for (int i = 0; i < 4; ++i)
643 { 643 {
644 Player* player = &pPlayers[i]; 644 Player* player = &pPlayers[i];
645 player->uExpressionTimePassed += (unsigned short)pMiscTimer->uTimeElapsed; 645 player->uExpressionTimePassed += (unsigned short)pMiscTimer->uTimeElapsed;
646 646
647 auto condition = player->GetMajorConditionIdx(); 647 uint condition = player->GetMajorConditionIdx();
648 if (condition == Condition_Good || condition == Condition_Zombie) 648 if (condition == Condition_Good || condition == Condition_Zombie)
649 { 649 {
650 if (player->uExpressionTimePassed < player->uExpressionTimeLength) 650 if (player->uExpressionTimePassed < player->uExpressionTimeLength)
651 continue; 651 continue;
652 652