Mercurial > mm7

comparison CastSpellInfo.cpp @ 1567:9f8b3e904e14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::ReceiveDamage, very small edits; prepended "Is" to item functions returning bool values (broken, indetified, stolen)
author Grumpy7
date Sun, 08 Sep 2013 05:22:33 +0200
parents 30db6d265ceb
children bb2378f58767
comparison
equal deleted inserted replaced
1566:1e5086f7d401 1567:9f8b3e904e14
996 break; 996 break;
997 v730c = &pParty->pPlayers[pCastSpell->uPlayerID_2].pInventoryItemList[a2]; 997 v730c = &pParty->pPlayers[pCastSpell->uPlayerID_2].pInventoryItemList[a2];
998 auto _itm = &pItemsTable->pItems[v730c->uItemID]; 998 auto _itm = &pItemsTable->pItems[v730c->uItemID];
999 v730c->UpdateTempBonus(pParty->uTimePlayed); 999 v730c->UpdateTempBonus(pParty->uTimePlayed);
1000 if ( v730c->uItemID < 64 || v730c->uItemID > 65 1000 if ( v730c->uItemID < 64 || v730c->uItemID > 65
1001 && !v730c->Broken() 1001 && !v730c->IsBroken()
1002 && !v730c->uSpecEnchantmentType 1002 && !v730c->uSpecEnchantmentType
1003 && !v730c->uEnchantmentType 1003 && !v730c->uEnchantmentType
1004 && ( _itm->uEquipType == 0 || _itm->uEquipType == 1 || _itm->uEquipType == 2) 1004 && ( _itm->uEquipType == 0 || _itm->uEquipType == 1 || _itm->uEquipType == 2)
1005 && !pItemsTable->IsMaterialNonCommon(v730c) ) 1005 && !pItemsTable->IsMaterialNonCommon(v730c) )
1006 { 1006 {
1948 v731 == 3 || v731 == 4 && 1948 v731 == 3 || v731 == 4 &&
1949 v245->uItemID <= 134 && 1949 v245->uItemID <= 134 &&
1950 v245->uSpecEnchantmentType == 0 && 1950 v245->uSpecEnchantmentType == 0 &&
1951 v245->uEnchantmentType == 0 && 1951 v245->uEnchantmentType == 0 &&
1952 v245->_bonus_strength== 0 && 1952 v245->_bonus_strength== 0 &&
1953 !v245->Broken() ) 1953 !v245->IsBroken() )
1954 { 1954 {
1955 if ( v245->GetValue() < 450 || 1955 if ( v245->GetValue() < 450 ||
1956 (v245->GetValue() < 250 && (v731 == 3 || v731 == 4) && _v725->uEquipType >= 0 && _v725->uEquipType <= 2) 1956 (v245->GetValue() < 250 && (v731 == 3 || v731 == 4) && _v725->uEquipType >= 0 && _v725->uEquipType <= 2)
1957 ) 1957 )
1958 { 1958 {