Mercurial > mm7
comparison Party.cpp @ 1136:3dc32954f1c7
Слияние
author | Ritor1 |
---|---|
date | Sat, 25 May 2013 02:23:47 +0600 |
parents | a7e63532b9a8 |
children | 29a8defbad9e |
comparison
equal
deleted
inserted
replaced
1135:6b34a45a3983 | 1136:3dc32954f1c7 |
---|---|
330 int pMagicSkills; // eax@5 | 330 int pMagicSkills; // eax@5 |
331 int uSkillIdx; // eax@11 | 331 int uSkillIdx; // eax@11 |
332 //unsigned __int8 v9; // zf@37 | 332 //unsigned __int8 v9; // zf@37 |
333 //char v10; // sf@37 | 333 //char v10; // sf@37 |
334 //unsigned __int8 v11; // of@37 | 334 //unsigned __int8 v11; // of@37 |
335 char *pAttributes; // eax@38 | 335 ItemGen *pItems; // eax@38 |
336 signed int v13; // ecx@38 | 336 signed int v13; // ecx@38 |
337 int uMaxSP; // eax@42 | 337 int uMaxSP; // eax@42 |
338 unsigned int v15; // [sp-4h] [bp-44h]@14 | 338 unsigned int v15; // [sp-4h] [bp-44h]@14 |
339 unsigned int v16; // [sp-4h] [bp-44h]@26 | 339 unsigned int v16; // [sp-4h] [bp-44h]@26 |
340 int v17; // [sp+10h] [bp-30h]@1 | 340 int v17; // [sp+10h] [bp-30h]@1 |
554 //v11 = uSkillIdx > 36; | 554 //v11 = uSkillIdx > 36; |
555 //v9 = v18 == 35; | 555 //v9 = v18 == 35; |
556 //v10 = uSkillIdx - 35 < 0; | 556 //v10 = uSkillIdx - 35 < 0; |
557 } | 557 } |
558 //while (uSkillIdx < 36); | 558 //while (uSkillIdx < 36); |
559 pAttributes = (char *)&pCharacter->pInventoryItems[0].uAttributes; | 559 pItems = pCharacter->pInventoryItems; |
560 //v13 = 138; | 560 //v13 = 138; |
561 for (v13 = 138; v13 > 0; --v13) | 561 for (int i = 0; i < 138; i++) |
562 { | 562 { |
563 if ( *((int *)pAttributes - 5) ) | 563 if ( pItems->uItemID ) |
564 *(int *)pAttributes |= 1; | 564 pItems->uAttributes |= 1; |
565 pAttributes += 36; | 565 ++pItems; |
566 //--v13; | 566 //--v13; |
567 } | 567 } |
568 //while ( v13 ); | 568 //while ( v13 ); |
569 } | 569 } |
570 pCharacter->sHealth = pCharacter->GetMaxHealth(); | 570 pCharacter->sHealth = pCharacter->GetMaxHealth(); |