| … | |
… | |
| 1221 | } |
1221 | } |
| 1222 | |
1222 | |
| 1223 | /* careful: chairs and tables are weapons! */ |
1223 | /* careful: chairs and tables are weapons! */ |
| 1224 | if (op->contr->mode & PU_ALLWEAPON) |
1224 | if (op->contr->mode & PU_ALLWEAPON) |
| 1225 | { |
1225 | { |
| 1226 | if (tmp->type == WEAPON && !tmp->name) |
1226 | if (tmp->type == WEAPON) |
| 1227 | { |
1227 | if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair")) |
| 1228 | if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL && |
|
|
| 1229 | strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL) |
|
|
| 1230 | { |
1228 | { |
| 1231 | CHK_PICK_PICKUP; |
1229 | CHK_PICK_PICKUP; |
| 1232 | continue; |
1230 | continue; |
| 1233 | } |
1231 | } |
| 1234 | } |
|
|
| 1235 | |
|
|
| 1236 | if (tmp->type == WEAPON && !tmp->name) |
|
|
| 1237 | { |
|
|
| 1238 | if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL) |
|
|
| 1239 | { |
|
|
| 1240 | CHK_PICK_PICKUP; |
|
|
| 1241 | continue; |
|
|
| 1242 | } |
|
|
| 1243 | } |
|
|
| 1244 | } |
1232 | } |
| 1245 | |
1233 | |
| 1246 | /* misc stuff that's useful */ |
1234 | /* misc stuff that's useful */ |
| 1247 | if (op->contr->mode & PU_KEY) |
1235 | if (op->contr->mode & PU_KEY) |
| 1248 | if (tmp->type == KEY || tmp->type == SPECIAL_KEY) |
1236 | if (tmp->type == KEY || tmp->type == SPECIAL_KEY) |
| … | |
… | |
| 1334 | } |
1322 | } |
| 1335 | } |
1323 | } |
| 1336 | else if (arrow->type == ARROW && arrow->race == type) |
1324 | else if (arrow->type == ARROW && arrow->race == type) |
| 1337 | { |
1325 | { |
| 1338 | /* allways prefer assasination/slaying */ |
1326 | /* allways prefer assasination/slaying */ |
| 1339 | if (target->race && arrow->slaying && strstr (arrow->slaying, target->race)) |
1327 | if (target->race && arrow->slaying && arrow->slaying.contains (target->race)) |
| 1340 | { |
1328 | { |
| 1341 | if (arrow->attacktype & AT_DEATH) |
1329 | if (arrow->attacktype & AT_DEATH) |
| 1342 | { |
1330 | { |
| 1343 | *better = 100; |
1331 | *better = 100; |
| 1344 | return arrow; |
1332 | return arrow; |
