[ViewVC] Diff of: cvs/deliantra/server/server/alchemy.C

Comparing deliantra/server/server/alchemy.C (file contents):
Revision 1.28 by root, Sun Apr 20 23:25:09 2008 UTC vs.
Revision 1.31 by root, Mon Sep 29 10:20:48 2008 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
             }
           while (rndm (0, 2));
         }
       return;
     }
   if (level == 40)
     {                           /* MAKE RANDOM RECIPE */
       recipelist *fl;
       int numb = numb_ob_inside (cauldron);
       if (fl && (rp = get_random_recipe (fl)))
         /* even though random, don't grant user any EXP for it */
         (void) attempt_recipe (op, cauldron, 1, rp, -1);
       else
         alchemy_failure_effect (op, cauldron, rp, level - 1);
-      return;
     }
   else if (level < 45)
     {                           /* INFURIATE NPC's */
       /* this is kind of kludgy I know... */
       cauldron->enemy = op;
       npc_call_help (cauldron);
       cauldron->enemy = NULL;
       alchemy_failure_effect (op, cauldron, rp, level - 5);
-      return;
     }
   else if (level < 50)
     {                           /* MINOR EXPLOSION/FIREBALL */
       object *tmp;
             tmp->stats.hp = random_roll (1, level, op, PREFER_LOW) / 10 + 2;
             new_draw_info_format (NDI_UNIQUE, 0, op, "The %s erupts in flame!", &cauldron->name);
             break;
         }
-      op->insert_at (cauldron);
+      tmp->insert_at (cauldron);
-      return;
     }
   else if (level < 60)
     {                           /* CREATE MONSTER */
       new_draw_info_format (NDI_UNIQUE, 0, op, "The %s %s.", &cauldron->name, cauldron_sound ());
       remove_contents (cauldron->inv, NULL);
-      return;
     }
   else if (level < 80)
     {                           /* MAJOR FIRE */
       object *fb = get_archetype (SP_MED_FIREBALL);
       remove_contents (cauldron->inv, NULL);
       fire_arch_from_position (cauldron, cauldron, cauldron->x, cauldron->y, 0, fb);
-      fb->destroy ();
+      fb->destroy (true);
       new_draw_info_format (NDI_UNIQUE, 0, op, "The %s erupts in flame!", &cauldron->name);
-      return;
     }
   else if (level < 100)
     {                           /* WHAMMY the CAULDRON */
       if (!QUERY_FLAG (cauldron, FLAG_CURSED))
         SET_FLAG (cauldron, FLAG_CURSED);
       else
         cauldron->magic--;
       cauldron->magic -= random_roll (0, 4, op, PREFER_LOW);
       if (rndm (0, 1))
         {
           remove_contents (cauldron->inv, NULL);
           new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s turns darker then makes a gulping sound!", &cauldron->name);
         }
       else
         new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s becomes darker.", &cauldron->name);
-      return;
     }
   else if (level < 110)
     {                           /* SUMMON EVIL MONSTERS */
       object *tmp = get_random_mon (level / 5);
       remove_contents (cauldron->inv, NULL);
       if (!tmp)
         alchemy_failure_effect (op, cauldron, rp, level);
       else if (summon_hostile_monsters (cauldron, random_roll (1, 10, op, PREFER_LOW), tmp->arch->archname))
         new_draw_info_format (NDI_UNIQUE, 0, op, "The %s %s and then pours forth monsters!", &cauldron->name, cauldron_sound ());
-      return;
     }
   else if (level < 150)
     {                           /* COMBO EFFECT */
       int roll = rndm (1, 3);
       while (roll)
         {
           alchemy_failure_effect (op, cauldron, rp, level - 39);
           roll--;
         }
-      return;
     }
   else if (level == 151)
     {                           /* CREATE RANDOM ARTIFACT */
       object *tmp;
             {
               remove_contents (cauldron->inv, tmp);
               new_draw_info_format (NDI_UNIQUE, 0, op, "The %s %s.", &cauldron->name, cauldron_sound ());
             }
         }
-      return;
     }
   else
     {                           /* MANA STORM - watch out!! */
       object *tmp = get_archetype (LOOSE_MANA);
       new_draw_info (NDI_UNIQUE, 0, op, "You unwisely release potent forces!");
       remove_contents (cauldron->inv, NULL);
       cast_magic_storm (op, tmp, level);
-      return;
     }
 }
 /*
  * All but object "save_item" are elimentated from
  * the container list. Note we have to becareful to remove the inventories
  * of objects in the cauldron inventory (ex icecube has stuff in it).
  */
 void
 remove_contents (object *first_ob, object *save_item)
 {
+  // this cries for a cleaner rewrite, removing save_item first possibly
   object *next, *tmp = first_ob;
   while (tmp)
     {
       next = tmp->below;
         }
       if (tmp->inv)
         remove_contents (tmp->inv, NULL);
-      tmp->destroy ();
+      tmp->destroy (true);
       tmp = next;
     }
 }
 /**

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/alchemy.C (file contents): Revision 1.28 by root, Sun Apr 20 23:25:09 2008 UTC vs. Revision 1.31 by root, Mon Sep 29 10:20:48 2008 UTC

Diff Legend

Comparing deliantra/server/server/alchemy.C (file contents):
Revision 1.28 by root, Sun Apr 20 23:25:09 2008 UTC vs.
Revision 1.31 by root, Mon Sep 29 10:20:48 2008 UTC