Mercurial > mm7

comparison Party.cpp @ 1826:bdac32c645c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changing arrays in class Player to std::array
author Grumpy7
date Wed, 09 Oct 2013 09:08:15 +0200
parents 4dee76d79c78
children 0c75c3e7e436
comparison
equal deleted inserted replaced
1825:23deb6b09c8c 1826:bdac32c645c5
252 252
253 v2 = pParty->pPlayers;//[0].pInventoryItems; 253 v2 = pParty->pPlayers;//[0].pInventoryItems;
254 while ( v2 <= &pParty->pPlayers[3] ) 254 while ( v2 <= &pParty->pPlayers[3] )
255 { 255 {
256 v3 = 0; 256 v3 = 0;
257 v4 = v2->pInventoryItemList; 257 v4 = v2->pInventoryItemList.data();
258 do 258 do
259 { 259 {
260 if ( v4->uItemID == uItemID ) 260 if ( v4->uItemID == uItemID )
261 return 1; 261 return 1;
262 ++v3; 262 ++v3;
562 //v11 = uSkillIdx > 36; 562 //v11 = uSkillIdx > 36;
563 //v9 = v18 == 35; 563 //v9 = v18 == 35;
564 //v10 = uSkillIdx - 35 < 0; 564 //v10 = uSkillIdx - 35 < 0;
565 } 565 }
566 //while (uSkillIdx < 36); 566 //while (uSkillIdx < 36);
567 pItems = pCharacter->pInventoryItemList; 567 pItems = pCharacter->pInventoryItemList.data();
568 //v13 = 138; 568 //v13 = 138;
569 for (int i = 0; i < 138; i++) 569 for (int i = 0; i < 138; i++)
570 { 570 {
571 if ( pItems->uItemID ) 571 if ( pItems->uItemID )
572 pItems->uAttributes |= 1; 572 pItems->uAttributes |= 1;
903 this->field_0 = 25; 903 this->field_0 = 25;
904 v2 = this->pPlayers;//[0].pPlayerBuffs; 904 v2 = this->pPlayers;//[0].pPlayerBuffs;
905 v6 = 4; 905 v6 = 4;
906 do 906 do
907 { 907 {
908 v3 = v2->pPlayerBuffs; 908 v3 = v2->pPlayerBuffs.data();
909 v7 = 24; 909 v7 = 24;
910 do 910 do
911 { 911 {
912 v3->Reset(); 912 v3->Reset();
913 ++v3; 913 ++v3;
1098 pPlayer->sHealth = pPlayer->GetMaxHealth(); 1098 pPlayer->sHealth = pPlayer->GetMaxHealth();
1099 pPlayer->sMana = pPlayer->GetMaxMana(); 1099 pPlayer->sMana = pPlayer->GetMaxMana();
1100 if ( pPlayer->classType == PLAYER_CLASS_LICH ) 1100 if ( pPlayer->classType == PLAYER_CLASS_LICH )
1101 { 1101 {
1102 have_vessels_soul = false; 1102 have_vessels_soul = false;
1103 v7 = pPlayer->pInventoryItemList;//[0].field_1A; 1103 v7 = pPlayer->pInventoryItemList.data();//[0].field_1A;
1104 for ( uint i = 138; i; --i ) 1104 for ( uint i = 138; i; --i )
1105 { 1105 {
1106 if ( v7->uItemID == 601 && (unsigned __int8)v7->uHolderPlayer == pPlayerID + 1 ) 1106 if ( v7->uItemID == 601 && (unsigned __int8)v7->uHolderPlayer == pPlayerID + 1 )
1107 have_vessels_soul = true; 1107 have_vessels_soul = true;
1108 ++v7; 1108 ++v7;