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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.5 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.6 by elmex, Tue Aug 29 11:58:02 2006 UTC

1/* 1/*
2 * static char *rcsid_spell_effect_c = 2 * static char *rcsid_spell_effect_c =
3 * "$Id: spell_effect.C,v 1.5 2006/08/29 08:01:38 root Exp $"; 3 * "$Id: spell_effect.C,v 1.6 2006/08/29 11:58:02 elmex Exp $";
4 */ 4 */
5 5
6 6
7/* 7/*
8 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
2340 2340
2341 /* Consider the movement tyep of the person with the aura as 2341 /* Consider the movement tyep of the person with the aura as
2342 * movement type of the aura. Eg, if the player is flying, the aura 2342 * movement type of the aura. Eg, if the player is flying, the aura
2343 * is flying also, if player is walking, it is on the ground, etc. 2343 * is flying also, if player is walking, it is on the ground, etc.
2344 */ 2344 */
2345 if (!(mflags & P_OUT_OF_MAP)
2345 if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK(env, GET_MAP_MOVE_BLOCK(m, nx, ny)))) { 2346 && !(OB_TYPE_MOVE_BLOCK(env, GET_MAP_MOVE_BLOCK(m, nx, ny))))
2347 {
2346 hit_map(aura,i,aura->attacktype,0); 2348 hit_map(aura,i,aura->attacktype,0);
2347 2349
2348 if(aura->other_arch) { 2350 if(aura->other_arch) {
2349 object *new_ob; 2351 object *new_ob;
2350 2352

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines