| … | |
… | |
| 1000 | continue; |
1000 | continue; |
| 1001 | } |
1001 | } |
| 1002 | |
1002 | |
| 1003 | /* wands/staves/rods/horns */ |
1003 | /* wands/staves/rods/horns */ |
| 1004 | if (op->contr->mode & PU_MAGIC_DEVICE) |
1004 | if (op->contr->mode & PU_MAGIC_DEVICE) |
| 1005 | if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) |
1005 | if (tmp->type == WAND |
|
|
1006 | || tmp->type == ROD |
|
|
1007 | || tmp->type == HORN |
|
|
1008 | || tmp->type == POWER_CRYSTAL) |
| 1006 | { |
1009 | { |
| 1007 | CHK_PICK_PICKUP; |
1010 | CHK_PICK_PICKUP; |
| 1008 | continue; |
1011 | continue; |
| 1009 | } |
1012 | } |
| 1010 | |
1013 | |
| 1011 | /* pick up all magical items */ |
1014 | /* pick up all magical items */ |
| 1012 | if (op->contr->mode & PU_MAGICAL) |
1015 | if (op->contr->mode & PU_MAGICAL) |
| 1013 | if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) |
1016 | if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) |
|
|
1017 | && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) |
| 1014 | { |
1018 | { |
| 1015 | CHK_PICK_PICKUP; |
1019 | CHK_PICK_PICKUP; |
| 1016 | continue; |
1020 | continue; |
| 1017 | } |
1021 | } |
| 1018 | |
1022 | |
| … | |
… | |
| 1025 | } |
1029 | } |
| 1026 | } |
1030 | } |
| 1027 | |
1031 | |
| 1028 | /* rings & amulets - talismans seems to be typed AMULET */ |
1032 | /* rings & amulets - talismans seems to be typed AMULET */ |
| 1029 | if (op->contr->mode & PU_JEWELS) |
1033 | if (op->contr->mode & PU_JEWELS) |
| 1030 | if (tmp->type == RING || tmp->type == AMULET) |
1034 | if (tmp->type == RING |
|
|
1035 | || tmp->type == AMULET |
|
|
1036 | || tmp->type == GIRDLE |
|
|
1037 | || tmp->type == SKILL_TOOL) |
| 1031 | { |
1038 | { |
| 1032 | CHK_PICK_PICKUP; |
1039 | CHK_PICK_PICKUP; |
| 1033 | continue; |
1040 | continue; |
| 1034 | } |
1041 | } |
| 1035 | |
1042 | |
| … | |
… | |
| 1084 | CHK_PICK_PICKUP; |
1091 | CHK_PICK_PICKUP; |
| 1085 | continue; |
1092 | continue; |
| 1086 | } |
1093 | } |
| 1087 | |
1094 | |
| 1088 | if (op->contr->mode & PU_GLOVES) |
1095 | if (op->contr->mode & PU_GLOVES) |
| 1089 | if (tmp->type == GLOVES) |
1096 | if (tmp->type == GLOVES || tmp->type == BRACERS) |
| 1090 | { |
1097 | { |
| 1091 | CHK_PICK_PICKUP; |
1098 | CHK_PICK_PICKUP; |
| 1092 | continue; |
1099 | continue; |
| 1093 | } |
1100 | } |
| 1094 | |
1101 | |
