[ViewVC] Diff of: cvs/deliantra/server/server/spell

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.99 by elmex, Tue Jan 13 13:29:57 2009 UTC vs.
Revision 1.102 by root, Tue May 5 04:51:56 2009 UTC

 /* earth to dust spell.  Basically destroys earthwalls in the area.
  */
 int
 cast_earth_to_dust (object *op, object *caster, object *spell_ob)
 {
-  object *tmp, *next;
   int range, i, j, mflags;
   sint16 sx, sy;
   maptile *m;
-  if (op->type != PLAYER)
-    return 0;
   range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
   for (i = -range; i <= range; i++)
     for (j = -range; j <= range; j++)
         mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
         if (mflags & P_OUT_OF_MAP)
           continue;
-        // earth to dust tears down everything that can be teared down
+        // earth to dust tears down everything that can be torn down
-        for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
+        for (object *next, *tmp = m->at (sx, sy).bot; tmp; tmp = next)
           {
             next = tmp->above;
             if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
               hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
           }
       }
 perceive_self (object *op)
 {
   const char *cp = describe_item (op, op);
   archetype *at = archetype::find (ARCH_DEPLETION);
-  dynbuf_text buf;
+  dynbuf_text &buf = msg_dynbuf; buf.clear ();
-  if (player *pl = op->contr)
+  if (!op->is_player ())
+    return 0;
-    if (object *race = archetype::find (op->race))
+  if (object *race = archetype::find (op->race))
-      buf << " - You are a G<male|female> " << &race->name << ".\n";
+    buf << " - You are a G<male|female> " << &race->name << ".\n";
   if (object *god = find_god (determine_god (op)))
     buf << " - You worship " << &god->name << ".\n";
   else
     buf << " - You worship no god.\n";
             break;
           }
       }
-  buf << '\0'; // zero-terminate
+  op->contr->infobox (MSG_CHANNEL ("perceiveself"), buf);
-  new_draw_info (NDI_UNIQUE, 0, op, buf.linearise ());
   return 1;
 }
 /* This creates magic walls.  Really, it can create most any object,
 /* Identifies objects in the players inventory/on the ground */
 int
 cast_identify (object *op, object *caster, object *spell)
 {
-  dynbuf_text buf;
   object *tmp;
+  dynbuf_text &buf = msg_dynbuf; buf.clear ();
-  int num_ident = spell->stats.dam + SP_level_dam_adjust (caster, spell);
+  int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell));
-  if (num_ident < 1)
-    num_ident = 1;
   for (tmp = op->inv; tmp; tmp = tmp->below)
     {
       if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
         {
               if (tmp->msg)
                 buf << "The item has a story:\r" << tmp->msg << "\n\n";
             }
-          num_ident--;
-          if (!num_ident)
+          if (!--num_ident)
             break;
         }
     }
   /* If all the power of the spell has been used up, don't go and identify
                 if (tmp->msg)
                   buf << "The item has a story:\r" << tmp->msg << "\n\n";
               }
-            num_ident--;
-            if (!num_ident)
+            if (!--num_ident)
               break;
           }
     }
   if (buf.empty ())

Diff Legend

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

Comparing deliantra/server/server/spell_effect.C (file contents): Revision 1.99 by elmex, Tue Jan 13 13:29:57 2009 UTC vs. Revision 1.102 by root, Tue May 5 04:51:56 2009 UTC

Diff Legend

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.99 by elmex, Tue Jan 13 13:29:57 2009 UTC vs.
Revision 1.102 by root, Tue May 5 04:51:56 2009 UTC