ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/alchemy.C
(Generate patch)

Comparing deliantra/server/server/alchemy.C (file contents):
Revision 1.12 by root, Tue Dec 12 20:53:03 2006 UTC vs.
Revision 1.13 by root, Tue Dec 12 21:39:57 2006 UTC

626 { /* MAJOR FIRE */ 626 { /* MAJOR FIRE */
627 object *fb = get_archetype (SP_MED_FIREBALL); 627 object *fb = get_archetype (SP_MED_FIREBALL);
628 628
629 remove_contents (cauldron->inv, NULL); 629 remove_contents (cauldron->inv, NULL);
630 fire_arch_from_position (cauldron, cauldron, cauldron->x, cauldron->y, 0, fb); 630 fire_arch_from_position (cauldron, cauldron, cauldron->x, cauldron->y, 0, fb);
631 fb->destroy (0); 631 fb->destroy ();
632 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s erupts in flame!", &cauldron->name); 632 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s erupts in flame!", &cauldron->name);
633 return; 633 return;
634 634
635 } 635 }
636 else if (level < 100) 636 else if (level < 100)
704 return; 704 return;
705 } 705 }
706} 706}
707 707
708 708
709/** 709/*
710 * All but object "save_item" are elimentated from 710 * All but object "save_item" are elimentated from
711 * the container list. Note we have to becareful to remove the inventories 711 * the container list. Note we have to becareful to remove the inventories
712 * of objects in the cauldron inventory (ex icecube has stuff in it). 712 * of objects in the cauldron inventory (ex icecube has stuff in it).
713 */ 713 */
714 714
718 object *next, *tmp = first_ob; 718 object *next, *tmp = first_ob;
719 719
720 while (tmp) 720 while (tmp)
721 { 721 {
722 next = tmp->below; 722 next = tmp->below;
723
723 if (tmp == save_item) 724 if (tmp == save_item)
724 { 725 {
725 if (!(tmp = next)) 726 if (!(tmp = next))
726 break; 727 break;
727 else 728 else
728 next = next->below; 729 next = next->below;
729 } 730 }
731
730 if (tmp->inv) 732 if (tmp->inv)
731 remove_contents (tmp->inv, NULL); 733 remove_contents (tmp->inv, NULL);
732 tmp->remove (); 734
733 tmp->destroy (0); 735 tmp->destroy ();
734 tmp = next; 736 tmp = next;
735 } 737 }
736} 738}
737 739
738/** 740/**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines