Mercurial > mm7

comparison UI/UICharacter.cpp @ 1358:61010a655c94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
a few itemID changed to their enum values + added a few new ones
author Grumpy7
date Sat, 13 Jul 2013 16:52:00 +0200
parents 8c2f689b5f0b
children b691c96d8e06
comparison
equal deleted inserted replaced
1357:06926081358f 1358:61010a655c94
2726 { 2726 {
2727 2727
2728 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0); 2728 pPlayers[uActiveCharacter]->PlaySound(SPEECH_39, 0);
2729 return; 2729 return;
2730 } 2730 }
2731 if ( pParty->pPickedItem.uItemID == 604 ) 2731 if ( pParty->pPickedItem.uItemID == ITEM_WETSUIT )
2732 { 2732 {
2733 pPlayers[uActiveCharacter]->EquipBody((ITEM_EQUIP_TYPE)3); 2733 pPlayers[uActiveCharacter]->EquipBody((ITEM_EQUIP_TYPE)3);
2734 WetsuitOn(uActiveCharacter); 2734 WetsuitOn(uActiveCharacter);
2735 return; 2735 return;
2736 } 2736 }
2754 { 2754 {
2755 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); 2755 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0);
2756 return; 2756 return;
2757 } 2757 }
2758 pPlayers[uActiveCharacter]->EquipBody((ITEM_EQUIP_TYPE)v6); 2758 pPlayers[uActiveCharacter]->EquipBody((ITEM_EQUIP_TYPE)v6);
2759 if ( pParty->pPickedItem.uItemID == 604 ) 2759 if ( pParty->pPickedItem.uItemID == ITEM_WETSUIT )
2760 WetsuitOff(uActiveCharacter); 2760 WetsuitOff(uActiveCharacter);
2761 return; 2761 return;
2762 case 0xAu: 2762 case 0xAu:
2763 if ( sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped(uActiveCharacter) ) 2763 if ( sub_43EE77_ProbablyIfUnderwaterSuitIsEquipped(uActiveCharacter) )
2764 { 2764 {
3041 { 3041 {
3042 v36 = v34 - 1; 3042 v36 = v34 - 1;
3043 v37 = (int)((char *)pPlayers[uActiveCharacter] + 36 * v36); 3043 v37 = (int)((char *)pPlayers[uActiveCharacter] + 36 * v36);
3044 v50 = v37; 3044 v50 = v37;
3045 v38 = (ItemGen *)(v37 + 532); 3045 v38 = (ItemGen *)(v37 + 532);
3046 v14 = v38->uItemID == 604; 3046 v14 = v38->uItemID == ITEM_WETSUIT;
3047 v52 = pItemsTable->pItems[v38->uItemID].uEquipType; 3047 v52 = pItemsTable->pItems[v38->uItemID].uEquipType;
3048 if ( v14 ) 3048 if ( v14 )
3049 { 3049 {
3050 if ( bUnderwater ) 3050 if ( bUnderwater )
3051 { 3051 {