Mercurial > mm7

comparison UI/UICharacter.cpp @ 1484:62c7f07bc05a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
UICharacter.cpp cleaning(continue) OnPaperdollLeftClick(3)
author Ritor1
date Thu, 29 Aug 2013 18:08:02 +0600
parents 223605b325b3
children 58d43397b827
comparison
equal deleted inserted replaced
1483:223605b325b3 1484:62c7f07bc05a
2321 int v1; // ecx@1 2321 int v1; // ecx@1
2322 unsigned int v2; // edi@1 2322 unsigned int v2; // edi@1
2323 unsigned int v3; // edx@4 2323 unsigned int v3; // edx@4
2324 unsigned int pSkillType; // esi@5 2324 unsigned int pSkillType; // esi@5
2325 unsigned __int16 v5; // ax@7 2325 unsigned __int16 v5; // ax@7
2326 //unsigned int v6; // edi@19
2327 int v7; // esi@27 2326 int v7; // esi@27
2328 int v8; // eax@29 2327 int v8; // eax@29
2329 //int v9; // edx@32
2330 int v10; // esi@34 2328 int v10; // esi@34
2331 //int v11; // eax@34
2332 int v12; // esi@38 2329 int v12; // esi@38
2333 //int v13; // eax@38
2334 char v14; // zf@38 2330 char v14; // zf@38
2335 int v15; // esi@42 2331 int v15; // esi@42
2336 //int v16; // eax@42
2337 int v17; // eax@44 2332 int v17; // eax@44
2338 unsigned int v18; // ecx@55 2333 unsigned int v18; // ecx@55
2339 unsigned int v19; // eax@55 2334 unsigned int v19; // eax@55
2340 int v20; // esi@60 2335 int v20; // esi@60
2341 //int v21; // eax@60
2342 unsigned int v22; // eax@61 2336 unsigned int v22; // eax@61
2343 int v23; // eax@62 2337 int v23; // eax@62
2344 int v24; // esi@65 2338 int v24; // esi@65
2345 int v25; // eax@65 2339 int v25; // eax@65
2346 int v26; // eax@69 2340 int v26; // eax@69
2365 int v52; // [sp+40h] [bp-Ch]@5 2359 int v52; // [sp+40h] [bp-Ch]@5
2366 ITEM_EQUIP_TYPE pEquipType; 2360 ITEM_EQUIP_TYPE pEquipType;
2367 2361
2368 v51 = 0; 2362 v51 = 0;
2369 _this.Reset(); 2363 _this.Reset();
2370 //v0 = pPlayers[uActiveCharacter];
2371 v1 = pPlayers[uActiveCharacter]->pEquipment.uMainHand; 2364 v1 = pPlayers[uActiveCharacter]->pEquipment.uMainHand;
2372 v2 = pPlayers[uActiveCharacter]->pEquipment.uShield; 2365 v2 = pPlayers[uActiveCharacter]->pEquipment.uShield;
2373 //v54 = pPlayers[uActiveCharacter]->pEquipment.uShield; 2366 //v54 = pPlayers[uActiveCharacter]->pEquipment.uShield;
2374 //v53 = v1; 2367 //v53 = v1;
2375 if ( v1 && pItemsTable->pItems[*(int *)&pPlayers[uActiveCharacter]->pInventoryItemList[v1 - 1]].uEquipType == 1 ) 2368 if ( v1 && pItemsTable->pItems[*(int *)&pPlayers[uActiveCharacter]->pInventoryItemList[v1 - 1]].uEquipType == 1 )
2395 else 2388 else
2396 { 2389 {
2397 if ( (pSkillType == 8 || pSkillType == 1 || pSkillType == 2) 2390 if ( (pSkillType == 8 || pSkillType == 1 || pSkillType == 2)
2398 && v1 2391 && v1
2399 && pItemsTable->pItems[*(int *)&pPlayers[uActiveCharacter]->pInventoryItemList[v1-1]].uSkillType == 4 ) 2392 && pItemsTable->pItems[*(int *)&pPlayers[uActiveCharacter]->pInventoryItemList[v1-1]].uSkillType == 4 )
2400 { 2393 {
2401 LOBYTE(v5) = pPlayers[uActiveCharacter]->GetActualSkillLevel(PLAYER_SKILL_SPEAR); 2394 LOBYTE(v5) = pPlayers[uActiveCharacter]->GetActualSkillLevel(PLAYER_SKILL_SPEAR);
2402 if ( (signed int)SkillToMastery(v5) < 3 ) 2395 if ( (signed int)SkillToMastery(v5) < 3 )
2403 { 2396 {
2404 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0); 2397 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0);
2405 return; 2398 return;
2406 } 2399 }
2407 } 2400 }
2408 } 2401 }
2409 if ( !pPlayers[uActiveCharacter]->CanEquip_RaceAndAlignmentCheck(v3) ) 2402 if ( !pPlayers[uActiveCharacter]->CanEquip_RaceAndAlignmentCheck(v3) )
2410 { 2403 {
2411 2404
2412 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0); 2405 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0);
2468 } 2461 }
2469 v7++; 2462 v7++;
2470 } 2463 }
2471 if ( v52 == 16 )//замещение последнего кольца 2464 if ( v52 == 16 )//замещение последнего кольца
2472 { 2465 {
2473 v52 = pPlayers[uActiveCharacter]->pEquipment.uRings[6] - 1; 2466 v52 = pPlayers[uActiveCharacter]->pEquipment.uRings[5] - 1;
2474 memcpy(&_this, &pParty->pPickedItem, sizeof(_this)); 2467 memcpy(&_this, &pParty->pPickedItem, sizeof(_this));
2475 v10 = (int)((char *)pPlayers[uActiveCharacter] + 36 * v52); 2468 v10 = (int)((char *)pPlayers[uActiveCharacter] + 36 * v52);
2476 *(char *)(v10 + 556) = 0; 2469 *(char *)(v10 + 556) = 0;
2477 pParty->pPickedItem.Reset(); 2470 pParty->pPickedItem.Reset();
2478 pParty->SetHoldingItem((ItemGen *)(v10 + 532)); 2471 pParty->SetHoldingItem(&pPlayers[uActiveCharacter]->pInventoryItemList[v52]);//(ItemGen *)(v10 + 532)
2479 _this.uBodyAnchor = 16; 2472 _this.uBodyAnchor = 16;
2480 memcpy((void *)(v10 + 532), &_this, 0x24u); 2473 memcpy((void *)(v10 + 532), &_this, 0x24u);
2481 pPlayers[uActiveCharacter]->pEquipment.uRings[6] = v52 + 1; 2474 pPlayers[uActiveCharacter]->pEquipment.uRings[6] = v52 + 1;
2482 } 2475 }
2483 return; 2476 return;