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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.28 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs.
Revision 1.32 by root, Tue Apr 24 12:32:16 2007 UTC

  */
 void
 move_bolt (object *op)
 {
-  object *tmp;
   int mflags;
   sint16 x, y;
   maptile *m;
   if (--op->duration < 0)
   /* If nothing alive on this space, no reason to do anything further */
   if (!(mflags & P_IS_ALIVE))
     return;
-  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
+  for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
     {
       if (QUERY_FLAG (tmp, FLAG_ALIVE))
         {
           dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
           if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
     }
   else
     check_bullet (op);
 }
 /* fire_bullet
  * object op (cast from caster) files a bolt in dir.
  * spob is the spell object for the bolt.
  * we remove the magic flag - that can be derived from
  * spob->attacktype.
     check_bullet (tmp);
   return 1;
 }
 /*****************************************************************************
  *
  * CONE RELATED FUNCTIONS
  *
  *****************************************************************************/
 /* drops an object based on what is in the cone's "other_arch" */
 void
 cone_drop (object *op)
 {
   tmp->update_stats ();
   return 1;
 }
 /**********************************************************************
  * mood change
  * Arguably, this may or may not be an attack spell.  But since it
  * effects monsters, it seems best to put it into this file
  ***********************************************************************/
   else if (god && !strcmp (spell->race, "GOD_FRIEND"))
     race = god->race;
   else
     race = spell->race;
   for (x = op->x - range; x <= op->x + range; x++)
     for (y = op->y - range; y <= op->y + range; y++)
       {
         done_one = 0;
         m = op->map;
         nx = x;
         ny = y;
         mflags = get_map_flags (m, &m, x, y, &nx, &ny);
         /* If there is nothing living on this space, no need to go further */
         if (!(mflags & P_IS_ALIVE))
           continue;
+        // players can only affect spaces that they can actually see
+        if (caster && caster->contr
+            && caster->contr->visibility_at (m, nx, ny) < 70)
+          continue;
-        for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
+        for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
           if (QUERY_FLAG (tmp, FLAG_MONSTER))
             break;
         /* There can be living objects that are not monsters */
         if (!tmp || tmp->type == PLAYER)
           head = tmp;
         /* Make sure the race is OK.  Likewise, only effect undead if spell specifically allows it */
         if (race && head->race && !strstr (race, head->race))
           continue;
         if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
           continue;
         /* Now do a bunch of stuff related to saving throws */
         best_at = -1;
             if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
               /* Failed, no effect */
               continue;
           }
-        /* Done with saving throw.  Now start effecting the monster */
+        /* Done with saving throw.  Now start affecting the monster */
         /* aggravation */
         if (QUERY_FLAG (spell, FLAG_MONSTER))
           {
             CLEAR_FLAG (head, FLAG_SLEEP);
-            if (QUERY_FLAG (head, FLAG_FRIENDLY))
-              remove_friendly_object (head);
+            remove_friendly_object (head);
             done_one = 1;
             head->enemy = op;
           }
         /* calm monsters */
    * if this has an other_arch field, we insert that in
    * the surround spaces.
    */
   for (j = 0; j < 9; j++)
     {
-      object *new_ob;
       hx = nx + freearr_x[j];
       hy = ny + freearr_y[j];
       m = op->map;
       mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
 #if 0
   // this is bogus: it causes wrong places to be checked below
   // (a wall 2 cells away will block the effect...) and
   // doesn't work for SP_BULLET anyhow, so again tests the wrong
   // space.
-  // should be fixed later, but correctness before featurs...
+  // should be fixed later, but correctness before features...
   // (schmorp)
   /* new offset calculation to make swarm element distribution
    * more uniform
    */
                 if (disease->stats.sp)
                   disease->stats.sp -= dam_mod;
                 if (infect_object (walk, disease, 1))
                   {
-                    object *flash;      /* visual effect for inflicting disease */
                     new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
                     disease->destroy ();      /* don't need this one anymore */
                     walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op);
                     return 1;

Diff Legend

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

Comparing deliantra/server/server/spell_attack.C (file contents): Revision 1.28 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs. Revision 1.32 by root, Tue Apr 24 12:32:16 2007 UTC

Diff Legend

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.28 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs.
Revision 1.32 by root, Tue Apr 24 12:32:16 2007 UTC