1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
… | |
… | |
828 | */ |
828 | */ |
829 | movetype = spell->other_arch->move_type; |
829 | movetype = spell->other_arch->move_type; |
830 | |
830 | |
831 | for (i = range_min; i <= range_max; i++) |
831 | for (i = range_min; i <= range_max; i++) |
832 | { |
832 | { |
833 | sint16 x, y, d; |
833 | sint16 x, y; |
834 | |
834 | |
835 | /* We can't use absdir here, because it never returns |
835 | /* We can't use absdir here, because it never returns |
836 | * 0. If this is a rune, we want to hit the person on top |
836 | * 0. If this is a rune, we want to hit the person on top |
837 | * of the trap (d==0). If it is not a rune, then we don't want |
837 | * of the trap (d==0). If it is not a rune, then we don't want |
838 | * to hit that person. |
838 | * to hit that person. |
839 | */ |
839 | */ |
840 | d = (dir + i) % 9; |
840 | int d = dir ? absdir (dir + i) : i; |
841 | |
841 | |
842 | /* If it's not a rune, we don't want to blast the caster. |
842 | /* If it's not a rune, we don't want to blast the caster. |
843 | * In that case, we have to see - if dir is specified, |
843 | * In that case, we have to see - if dir is specified, |
844 | * turn this into direction 8. If dir is not specified (all |
844 | * turn this into direction 8. If dir is not specified (all |
845 | * direction) skip - otherwise, one line would do more damage |
845 | * direction) skip - otherwise, one line would do more damage |
… | |
… | |
947 | |
947 | |
948 | object *env = op->outer_env (); |
948 | object *env = op->outer_env (); |
949 | |
949 | |
950 | if (op->env) |
950 | if (op->env) |
951 | { |
951 | { |
952 | if (env->map == NULL) |
952 | if (!env->map) |
953 | return; |
953 | return; |
954 | |
954 | |
955 | if (!(op = op->insert_at (env, op))) |
955 | if (!(op = op->insert_at (env, op))) |
956 | return; |
956 | return; |
957 | } |
957 | } |
958 | |
958 | |
959 | // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding |
959 | // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding |
960 | // on a safe map. I don't like this special casing, but it seems to be neccessary |
960 | // on a safe map. I don't like this special casing, but it seems to be neccessary |
961 | // as bombs can be carried. |
961 | // as bombs can be carried. |
962 | if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) |
962 | if (op->ms ().flags () & P_SAFE) |
963 | { |
963 | { |
964 | op->destroy (); |
964 | op->destroy (); |
965 | return; |
965 | return; |
966 | } |
966 | } |
967 | |
967 | |
… | |
… | |
1908 | |
1908 | |
1909 | tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); |
1909 | tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); |
1910 | |
1910 | |
1911 | if (tmp->glow_radius) |
1911 | if (tmp->glow_radius) |
1912 | tmp->set_glow_radius ( |
1912 | tmp->set_glow_radius ( |
1913 | min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell))); |
1913 | min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell)) |
|
|
1914 | ); |
1914 | |
1915 | |
1915 | if (dir) |
1916 | if (dir) |
1916 | m->insert (tmp, x, y, op); |
1917 | m->insert (tmp, x, y, op); |
1917 | else |
1918 | else |
1918 | caster->outer_env ()->insert (tmp); |
1919 | caster->outer_env ()->insert (tmp); |