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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.74 by root, Sat May 17 15:03:04 2008 UTC vs.
Revision 1.76 by root, Wed Jul 16 14:29:40 2008 UTC

394{ 394{
395 if (!xy_normalise (m, x, y)) 395 if (!xy_normalise (m, x, y))
396 return 0; 396 return 0;
397 397
398 mapspace &ms = m->at (x, y); 398 mapspace &ms = m->at (x, y);
399 ms.update ();
399 400
400 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block)) 401 if (OB_TYPE_MOVE_BLOCK (op, ms.move_block))
401 return 0; 402 return 0;
402 403
403 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 404 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1434 check_bullet (op); 1435 check_bullet (op);
1435 return; 1436 return;
1436 } 1437 }
1437} 1438}
1438 1439
1439/* This is called by move_apply. Basically, if someone 1440/* This is called by move_apply. Basically, if someone
1440 * moves onto a spell effect and the walk_on or fly_on flags 1441 * moves onto a spell effect and the walk_on or fly_on flags
1441 * are set, this is called. This should only be called for 1442 * are set, this is called. This should only be called for
1442 * objects of the appropraite type. 1443 * objects of the appropriate type.
1443 */ 1444 */
1444void 1445void
1445apply_spell_effect (object *spell, object *victim) 1446apply_spell_effect (object *spell, object *victim)
1446{ 1447{
1447 switch (spell->subtype) 1448 switch (spell->subtype)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines