Mercurial > mm7

comparison Party.cpp @ 1861:a86c60679949

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
author Grumpy7
date Mon, 14 Oct 2013 06:32:30 +0200
parents 785be3f53d9b
children 351b4ff10ac1
comparison
equal deleted inserted replaced
1860:3186f469323a 1861:a86c60679949
97 field_0 = 25; 97 field_0 = 25;
98 98
99 uNumDeaths = 0; 99 uNumDeaths = 0;
100 uNumPrisonTerms = 0; 100 uNumPrisonTerms = 0;
101 uNumBountiesCollected = 0; 101 uNumBountiesCollected = 0;
102 memset(monster_for_hunting_killed, 5, sizeof(__int16)); 102 memset(monster_for_hunting_killed.data(), 5, sizeof(__int16));
103 memset(monster_id_for_hunting, 5, sizeof(__int16)); 103 memset(monster_id_for_hunting.data(), 5, sizeof(__int16));
104 memset(_quest_bits, 64, sizeof(__int8)); 104 memset(_quest_bits, 64, sizeof(__int8));
105 memset(pArcomageWins, 16, sizeof(__int8)); 105 memset(pArcomageWins.data(), 16, sizeof(__int8));
106 uNumArenaPageWins = 0; 106 uNumArenaPageWins = 0;
107 uNumArenaSquireWins = 0; 107 uNumArenaSquireWins = 0;
108 uNumArenaKnightWins = 0; 108 uNumArenaKnightWins = 0;
109 uNumArenaLordWins = 0; 109 uNumArenaLordWins = 0;
110 110
291 ItemGen Dst; // [sp+1Ch] [bp-24h]@10 291 ItemGen Dst; // [sp+1Ch] [bp-24h]@10
292 292
293 pHireling1Name[0] = 0; 293 pHireling1Name[0] = 0;
294 pHireling2Name[0] = 0; 294 pHireling2Name[0] = 0;
295 this->hirelingScrollPosition = 0; 295 this->hirelingScrollPosition = 0;
296 memset(pHirelings, 0, 2 * sizeof(*pHirelings)); 296 memset(pHirelings.data(), 0, 2 * sizeof(NPCData));
297 297
298 strcpy(this->pPlayers[0].pName, pGlobalTXT_LocalizationStrings[509]); //Zoltan 298 strcpy(this->pPlayers[0].pName, pGlobalTXT_LocalizationStrings[509]); //Zoltan
299 this->pPlayers[0].uPrevFace = 17; 299 this->pPlayers[0].uPrevFace = 17;
300 this->pPlayers[0].uCurrentFace = 17; 300 this->pPlayers[0].uCurrentFace = 17;
301 this->pPlayers[0].uPrevVoiceID = 17; 301 this->pPlayers[0].uPrevVoiceID = 17;
490 uLastRegenerationTime = 0x21C00; 490 uLastRegenerationTime = 0x21C00;
491 491
492 bTurnBasedModeOn = false; 492 bTurnBasedModeOn = false;
493 493
494 uActiveCharacter = 1; 494 uActiveCharacter = 1;
495 ::pPlayers.ZerothIndex() = pPlayers; 495 ::pPlayers.ZerothIndex() = &pPlayers[0];
496 for (uint i = 0; i < 4; ++i) 496 for (uint i = 0; i < 4; ++i)
497 ::pPlayers[i + 1] = &pPlayers[i]; 497 ::pPlayers[i + 1] = &pPlayers[i];
498 498
499 pPlayers[0].Reset(PLAYER_CLASS_KNIGHT); 499 pPlayers[0].Reset(PLAYER_CLASS_KNIGHT);
500 pPlayers[1].Reset(PLAYER_CLASS_THEIF); 500 pPlayers[1].Reset(PLAYER_CLASS_THEIF);
552 552
553 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 100; // default character ui - stats 553 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 100; // default character ui - stats
554 uFlags = 0; 554 uFlags = 0;
555 memset(_autonote_bits, 0, 26); 555 memset(_autonote_bits, 0, 26);
556 memset(_quest_bits, 0, 64); 556 memset(_quest_bits, 0, 64);
557 memset(pIsArtifactFound, 0, 29); 557 memset(pIsArtifactFound.data(), 0, 29);
558 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_RED_POTION_ACTIVE, 1); 558 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_RED_POTION_ACTIVE, 1);
559 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_SEASHELL_ACTIVE, 1); 559 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_SEASHELL_ACTIVE, 1);
560 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_LONGBOW_ACTIVE, 1); 560 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_LONGBOW_ACTIVE, 1);
561 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_PLATE_ACTIVE, 1); 561 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_PLATE_ACTIVE, 1);
562 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_LUTE_ACTIVE, 1); 562 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_LUTE_ACTIVE, 1);
563 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_HAT_ACTIVE, 1); 563 _449B7E_toggle_bit(_quest_bits, PARTY_QUEST_EMERALD_HAT_ACTIVE, 1);
564 564
565 memset(PartyTimes._shop_ban_times,0,53*sizeof(__int64)); 565 memset(PartyTimes._shop_ban_times.data(),0,53*sizeof(__int64));
566 566
567 memcpy(pNPCStats->pNewNPCData, pNPCStats->pNPCData, 0x94BCu); 567 memcpy(pNPCStats->pNewNPCData, pNPCStats->pNPCData, 0x94BCu);
568 memcpy(pNPCStats->pGroups_copy, pNPCStats->pGroups, 0x66u); 568 memcpy(pNPCStats->pGroups_copy, pNPCStats->pGroups, 0x66u);
569 pNPCStats->pNewNPCData[3].uFlags |= 128;//|= 0x80u; Lady Margaret 569 pNPCStats->pNewNPCData[3].uFlags |= 128;//|= 0x80u; Lady Margaret
570 _494035_timed_effects__water_walking_damage__etc(); 570 _494035_timed_effects__water_walking_damage__etc();