--- deliantra/server/server/spell_attack.C 2011/05/01 16:58:17 1.107 +++ deliantra/server/server/spell_attack.C 2016/11/16 22:14:06 1.113 @@ -1,24 +1,24 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. - * - * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team * Copyright (©) 1992 Frank Tore Johansen - * + * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the * Free Software Foundation, either version 3 of the License, or (at your * option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the Affero GNU General Public License * and the GNU General Public License along with this program. If not, see * . - * + * * The authors can be reached via e-mail to */ @@ -1098,7 +1098,7 @@ return NULL; } -/* cast_smite_arch() - the priest points to a creature and causes +/* cast_smite_spell() - the priest points to a creature and causes * a 'godly curse' to decend. * usual params - * op = player @@ -1111,9 +1111,7 @@ { object *effect, *target; object *god = find_god (determine_god (op)); - int range; - range = spell->range + SP_level_range_adjust (caster, spell); target = get_pointed_target (op, dir, 50, spell->stats.grace ? SPELL_GRACE : SPELL_MANA); /* Bunch of conditions for casting this spell. Note that only @@ -1463,7 +1461,7 @@ mapspace &ms = m->at (nx, ny); /* If there is nothing living on this space, no need to go further */ - if (!ms.flags () & P_IS_ALIVE) + if (!(ms.flags () & P_IS_ALIVE)) continue; // players can only affect spaces that they can actually see @@ -1998,8 +1996,8 @@ disease->last_sp = 1; } - if (disease->stats.dam ) disease->stats.dam += copysign (disease->stats.dam , dam_mod); - if (disease->stats.maxsp) disease->stats.maxsp += copysign (disease->stats.maxsp, dam_mod); + if (disease->stats.dam ) disease->stats.dam += copysignl (disease->stats.dam , dam_mod); + if (disease->stats.maxsp) disease->stats.maxsp += copysignl (disease->stats.maxsp, dam_mod); if (disease->stats.ac ) disease->stats.ac += dam_mod; if (disease->last_eat ) disease->last_eat -= dam_mod; if (disease->stats.hp ) disease->stats.hp -= dam_mod;