| … | |
… | |
| 230 | if (op->inv && op->inv->type == DISEASE) |
230 | if (op->inv && op->inv->type == DISEASE) |
| 231 | { |
231 | { |
| 232 | object *disease = op->inv; |
232 | object *disease = op->inv; |
| 233 | |
233 | |
| 234 | infect_object (victim, disease, 1); |
234 | infect_object (victim, disease, 1); |
| 235 | remove_ob (disease); |
235 | disease->remove (); |
| 236 | free_object (disease); |
236 | disease->destroy (0); |
| 237 | } |
237 | } |
| 238 | } |
238 | } |
| 239 | else |
239 | else |
| 240 | hit_map (op, 0, op->attacktype, 1); |
240 | hit_map (op, 0, op->attacktype, 1); |
| 241 | } |
241 | } |
| … | |
… | |
| 305 | else |
305 | else |
| 306 | { |
306 | { |
| 307 | object *spell = arch_to_object (trap->other_arch); |
307 | object *spell = arch_to_object (trap->other_arch); |
| 308 | |
308 | |
| 309 | cast_spell (env, trap, trap->direction, spell, NULL); |
309 | cast_spell (env, trap, trap->direction, spell, NULL); |
| 310 | free_object (spell); |
310 | spell->destroy (0); |
| 311 | } |
311 | } |
| 312 | } |
312 | } |
| 313 | } |
313 | } |
| 314 | else |
314 | else |
| 315 | { |
315 | { |
| … | |
… | |
| 363 | * if you fail, no point on that. I suppose we could do a level |
363 | * if you fail, no point on that. I suppose we could do a level |
| 364 | * comparison so low level players can't erase high level players runes. |
364 | * comparison so low level players can't erase high level players runes. |
| 365 | */ |
365 | */ |
| 366 | if (tmp->type == SIGN && !strcmp (tmp->arch->name, "rune_mark")) |
366 | if (tmp->type == SIGN && !strcmp (tmp->arch->name, "rune_mark")) |
| 367 | { |
367 | { |
| 368 | remove_ob (tmp); |
368 | tmp->remove (); |
| 369 | free_object (tmp); |
369 | tmp->destroy (0); |
| 370 | new_draw_info (NDI_UNIQUE, 0, op, "You wipe out the rune of marking!"); |
370 | new_draw_info (NDI_UNIQUE, 0, op, "You wipe out the rune of marking!"); |
| 371 | return 1; |
371 | return 1; |
| 372 | } |
372 | } |
| 373 | |
373 | |
| 374 | /* now search tmp's inventory for traps |
374 | /* now search tmp's inventory for traps |
