| … | |
… | |
| 328 | { |
328 | { |
| 329 | if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) |
329 | if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) |
| 330 | && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) |
330 | && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) |
| 331 | && sacrifice->type != PLAYER) |
331 | && sacrifice->type != PLAYER) |
| 332 | { |
332 | { |
| 333 | if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 |
333 | if (ARCH_SACRIFICE (altar) == shstr_money |
| 334 | && sacrifice->type == MONEY |
334 | && sacrifice->type == MONEY |
| 335 | && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) |
335 | && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) |
| 336 | return 1; |
336 | return 1; |
| 337 | |
337 | |
| 338 | if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname |
338 | if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname |
| … | |
… | |
| 371 | return 0; |
371 | return 0; |
| 372 | |
372 | |
| 373 | /* check_altar_sacrifice should have already verified that enough money |
373 | /* check_altar_sacrifice should have already verified that enough money |
| 374 | * has been dropped. |
374 | * has been dropped. |
| 375 | */ |
375 | */ |
| 376 | if (!strcmp (ARCH_SACRIFICE (altar), "money")) |
376 | if (ARCH_SACRIFICE (altar) == shstr_money) |
| 377 | { |
377 | { |
| 378 | int number = NROF_SACRIFICE (altar) / (*sacrifice)->value; |
378 | int number = NROF_SACRIFICE (altar) / (*sacrifice)->value; |
| 379 | |
379 | |
| 380 | /* Round up any sacrifices. Altars don't make change either */ |
380 | /* Round up any sacrifices. Altars don't make change either */ |
| 381 | if (NROF_SACRIFICE (altar) % (*sacrifice)->value) |
381 | if (NROF_SACRIFICE (altar) % (*sacrifice)->value) |
