Mercurial > mm7

comparison UI/UICharacter.cpp @ 1754:421c29d4ab3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
UITransition.cpp cleaning(continue)
author Ritor1
date Mon, 30 Sep 2013 17:29:27 +0600
parents baa4eda7f924
children 0f1543750bf8
comparison
equal deleted inserted replaced
1753:999bf8c99514 1754:421c29d4ab3e
2403 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0); 2403 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0);
2404 return; 2404 return;
2405 } 2405 }
2406 if ( pPlayers[uActiveCharacter]->HasUnderwaterSuitEquipped() && (pEquipType != EQUIP_ARMOUR || bUnderwater) ) 2406 if ( pPlayers[uActiveCharacter]->HasUnderwaterSuitEquipped() && (pEquipType != EQUIP_ARMOUR || bUnderwater) )
2407 { 2407 {
2408 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); 2408 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0);
2409 return; 2409 return;
2410 } 2410 }
2411 pPlayers[uActiveCharacter]->EquipBody(pEquipType); 2411 pPlayers[uActiveCharacter]->EquipBody(pEquipType);
2412 if ( pParty->pPickedItem.uItemID == ITEM_WETSUIT ) 2412 if ( pParty->pPickedItem.uItemID == ITEM_WETSUIT )
2413 WetsuitOff(uActiveCharacter); 2413 WetsuitOff(uActiveCharacter);
2414 return; 2414 return;
2415 //------------------------dress rings(одевание колец)---------------------------------- 2415 //------------------------dress rings(одевание колец)----------------------------------
2416 case EQUIP_RING: 2416 case EQUIP_RING:
2417 if ( pPlayers[uActiveCharacter]->HasUnderwaterSuitEquipped() ) 2417 if ( pPlayers[uActiveCharacter]->HasUnderwaterSuitEquipped() )
2418 { 2418 {
2419 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); 2419 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0);
2420 return; 2420 return;
2421 } 2421 }
2422 //слоты для колец 2422 //слоты для колец
2423 v7 = 0; 2423 v7 = 0;
2424 for ( v52 = 10; (signed int)v52 < 16; ++v52 ) 2424 for ( v52 = 10; (signed int)v52 < 16; ++v52 )
2451 return; 2451 return;
2452 //------------------dress shield(одеть щит)------------------------------------------------------ 2452 //------------------dress shield(одеть щит)------------------------------------------------------
2453 case EQUIP_SHIELD://Щит 2453 case EQUIP_SHIELD://Щит
2454 if ( pPlayers[uActiveCharacter]->HasUnderwaterSuitEquipped() )//в акваланге 2454 if ( pPlayers[uActiveCharacter]->HasUnderwaterSuitEquipped() )//в акваланге
2455 { 2455 {
2456 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); 2456 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0);
2457 return; 2457 return;
2458 } 2458 }
2459 if ( !pPlayers[uActiveCharacter]->HasSkill(pSkillType) )//нет навыка 2459 if ( !pPlayers[uActiveCharacter]->HasSkill(pSkillType) )//нет навыка
2460 { 2460 {
2461 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0); 2461 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0);
2504 case EQUIP_WAND: 2504 case EQUIP_WAND:
2505 if ( pPlayers[uActiveCharacter]->HasUnderwaterSuitEquipped() 2505 if ( pPlayers[uActiveCharacter]->HasUnderwaterSuitEquipped()
2506 && pParty->pPickedItem.uItemID != 64 2506 && pParty->pPickedItem.uItemID != 64
2507 && pParty->pPickedItem.uItemID != 65 ) 2507 && pParty->pPickedItem.uItemID != 65 )
2508 { 2508 {
2509 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); 2509 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0);
2510 return; 2510 return;
2511 } 2511 }
2512 if ( !pPlayers[uActiveCharacter]->HasSkill(pSkillType) ) 2512 if ( !pPlayers[uActiveCharacter]->HasSkill(pSkillType) )
2513 { 2513 {
2514 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0); 2514 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0);
2606 break; 2606 break;
2607 //---------------------------take two hands(взять двумя руками)--------------------------------- 2607 //---------------------------take two hands(взять двумя руками)---------------------------------
2608 case EQUIP_MAIN_HAND: 2608 case EQUIP_MAIN_HAND:
2609 if ( pPlayers[uActiveCharacter]->HasUnderwaterSuitEquipped() ) 2609 if ( pPlayers[uActiveCharacter]->HasUnderwaterSuitEquipped() )
2610 { 2610 {
2611 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); 2611 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0);
2612 return; 2612 return;
2613 } 2613 }
2614 if ( !pPlayers[uActiveCharacter]->HasSkill(pSkillType) ) 2614 if ( !pPlayers[uActiveCharacter]->HasSkill(pSkillType) )
2615 { 2615 {
2616 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0); 2616 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0);
2618 } 2618 }
2619 if ( v1 )//взять двуручный меч кода нет щита(замещение оружия) 2619 if ( v1 )//взять двуручный меч кода нет щита(замещение оружия)
2620 { 2620 {
2621 if ( v2 ) 2621 if ( v2 )
2622 { 2622 {
2623 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); 2623 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0);
2624 return; 2624 return;
2625 } 2625 }
2626 --v1; 2626 --v1;
2627 memcpy(&_this, &pParty->pPickedItem, sizeof(_this)); 2627 memcpy(&_this, &pParty->pPickedItem, sizeof(_this));
2628 pPlayers[uActiveCharacter]->pInventoryItemList[v1].uBodyAnchor = 0; 2628 pPlayers[uActiveCharacter]->pInventoryItemList[v1].uBodyAnchor = 0;
2675 pEquipType = v38->GetItemEquipType(); 2675 pEquipType = v38->GetItemEquipType();
2676 if ( v38->uItemID == ITEM_WETSUIT ) 2676 if ( v38->uItemID == ITEM_WETSUIT )
2677 { 2677 {
2678 if ( bUnderwater ) 2678 if ( bUnderwater )
2679 { 2679 {
2680 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); 2680 pAudioPlayer->PlaySound(SOUND_error, 0, 0, -1, 0, 0, 0, 0);
2681 return; 2681 return;
2682 } 2682 }
2683 WetsuitOff(uActiveCharacter); 2683 WetsuitOff(uActiveCharacter);
2684 } 2684 }
2685 if ( _50C9A0_IsEnchantingInProgress )//наложить закл на экипировку 2685 if ( _50C9A0_IsEnchantingInProgress )//наложить закл на экипировку