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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.103 by elmex, Mon Jun 8 08:57:34 2009 UTC vs.
Revision 1.104 by root, Sat Jun 27 03:51:05 2009 UTC

  * The # of arrows created also goes up with level, so if a 30th level mage
  * wants LOTS of arrows, and doesn't care what the plus is he could
  * create nonnmagic arrows, or even -1, etc...
  */
 int
-cast_create_missile (object *op, object *caster, object *spell, int dir, const char *stringarg)
+cast_create_missile (object *op, object *caster, object *spell, int dir, const char *spellparam)
 {
   int bonus_plus = 0;
   const char *missile_name = "arrow";
   for (object *tmp = op->inv; tmp; tmp = tmp->below)
       return 0;
     }
   object *missile = missile_arch->instance ();
-  if (stringarg)
+  if (spellparam)
     {
       /* If it starts with a letter, presume it is a description */
-      if (isalpha (*stringarg))
+      if (isalpha (*spellparam))
         {
           artifact *al = find_artifactlist (missile->type)->items;
           for (; al; al = al->next)
-            if (!strcasecmp (al->item->name, stringarg))
+            if (!strcasecmp (al->item->name, spellparam))
               break;
           if (!al)
             {
               missile->destroy ();
-              new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, stringarg);
+              new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, spellparam);
               return 0;
             }
           if (al->item->slaying)
             {
               missile->destroy ();
-              new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, stringarg);
+              new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, spellparam);
               return 0;
             }
           give_artifact_abilities (missile, al->item);
           /* These special arrows cost something extra. Don't have them also be magical -
            * the parsing of having to do both plus and type.
            */
           bonus_plus = 1 + (al->item->value / 5);
           missile_plus = 0;
         }
-      else if (atoi (stringarg) < missile_plus)
+      else if (atoi (spellparam) < missile_plus)
-        missile_plus = atoi (stringarg);
+        missile_plus = atoi (spellparam);
     }
   missile_plus = clamp (missile_plus, -4, 4);
   missile->nrof = spell->duration + SP_level_duration_adjust (caster, spell);
   return 1;
 }
 /*  allows the choice of what sort of food object to make.
- *  If stringarg is NULL, it will create food dependent on level  --PeterM*/
+ *  If spellparam is NULL, it will create food dependent on level  --PeterM*/
 int
-cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *stringarg)
+cast_create_food (object *op, object *caster, object *spell_ob, int dir, const char *spellparam)
 {
   int food_value;
   archetype *at = NULL;
   object *new_op;
   food_value = spell_ob->stats.food + 50 * SP_level_duration_adjust (caster, spell_ob);
-  if (stringarg)
+  if (spellparam)
     {
-      at = find_archetype_by_object_type_name (FOOD, stringarg);
+      at = find_archetype_by_object_type_name (FOOD, spellparam);
       if (at == NULL)
-        at = find_archetype_by_object_type_name (DRINK, stringarg);
+        at = find_archetype_by_object_type_name (DRINK, spellparam);
       if (at == NULL || at->stats.food > food_value)
-        stringarg = NULL;
+        spellparam = NULL;
     }
-  if (!stringarg)
+  if (!spellparam)
     {
       archetype *at_tmp;
       /* We try to find the archetype with the maximum food value.
        * This removes the dependancy of hard coded food values in this
   return 1;
 }
 int
-dimension_door (object *op, object *caster, object *spob, int dir)
+dimension_door (object *op, object *caster, object *spob, int dir, const char *spellparam)
 {
   uint32 dist, maxdist;
   int mflags;
   maptile *m;
   sint16 sx, sy;
   /* Given the new outdoor maps, can't let players dimension door for
    * ever, so put limits in.
    */
   maxdist = spob->range + SP_level_range_adjust (caster, spob);
-  if (op->contr->count)
+  if (spellparam)
     {
+      int count = atoi (spellparam);
-      if (op->contr->count > maxdist)
+      if (count > maxdist)
         {
           new_draw_info (NDI_UNIQUE, 0, op, "You can't dimension door that far!");
           return 0;
         }
-      for (dist = 0; dist < op->contr->count; dist++)
+      for (dist = 0; dist < count; dist++)
         {
           mflags = get_map_flags (op->map, &m, op->x + freearr_x[dir] * (dist + 1), op->y + freearr_y[dir] * (dist + 1), &sx, &sy);
           if (mflags & (P_NO_MAGIC | P_OUT_OF_MAP))
             break;
           if ((mflags & P_BLOCKSVIEW) && OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
             break;
         }
-      if (dist < op->contr->count)
+      if (dist < count)
         {
           new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the spell.\n");
-          op->contr->count = 0;
           return 0;
         }
-      op->contr->count = 0;
       /* Remove code that puts player on random space on maps.  IMO,
        * a lot of maps probably have areas the player should not get to,
        * but may not be marked as NO_MAGIC (as they may be bounded
        * by such squares).  Also, there are probably treasure rooms and

Diff Legend

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

Comparing deliantra/server/server/spell_effect.C (file contents): Revision 1.103 by elmex, Mon Jun 8 08:57:34 2009 UTC vs. Revision 1.104 by root, Sat Jun 27 03:51:05 2009 UTC

Diff Legend

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.103 by elmex, Mon Jun 8 08:57:34 2009 UTC vs.
Revision 1.104 by root, Sat Jun 27 03:51:05 2009 UTC