--- deliantra/server/server/spell_attack.C	2010/03/26 00:53:26	1.97
+++ deliantra/server/server/spell_attack.C	2010/04/09 02:45:17	1.100
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 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
@@ -2000,56 +2000,29 @@
                 disease->level = casting_level (caster, spell);
 
                 /* do level adjustments */
-                if (disease->stats.wc)
-                  disease->stats.wc += dur_mod / 2;
-
-                if (disease->magic > 0)
-                  disease->magic += dur_mod / 8;
-
-                if (disease->stats.maxhp > 0)
-                  disease->stats.maxhp += dur_mod;
-
-                if (disease->stats.maxgrace > 0)
-                  disease->stats.maxgrace += dur_mod;
-
-                if (disease->stats.dam)
-                  {
-                    if (disease->stats.dam > 0)
-                      disease->stats.dam += dam_mod;
-                    else
-                      disease->stats.dam -= dam_mod;
-                  }
+                if (disease->stats.wc          ) disease->stats.wc       += dur_mod / 2;
+                if (disease->magic          > 0) disease->magic          += dur_mod / 8;
+                if (disease->stats.maxhp    > 0) disease->stats.maxhp    += dur_mod;
+                if (disease->stats.maxgrace > 0) disease->stats.maxgrace += dur_mod;
 
                 if (disease->last_sp)
                   {
                     disease->last_sp -= 2 * dam_mod;
+
                     if (disease->last_sp < 1)
                       disease->last_sp = 1;
                   }
 
-                if (disease->stats.maxsp)
-                  {
-                    if (disease->stats.maxsp > 0)
-                      disease->stats.maxsp += dam_mod;
-                    else
-                      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;
-
-                if (disease->stats.sp)
-                  disease->stats.sp -= dam_mod;
+                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.ac   ) disease->stats.ac    += dam_mod;
+                if (disease->last_eat   ) disease->last_eat    -= dam_mod;
+                if (disease->stats.hp   ) disease->stats.hp    -= dam_mod;
+                if (disease->stats.sp   ) disease->stats.sp    -= dam_mod;
 
                 if (infect_object (walk, disease, 1))
                   {
-                    new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
+                    op->statusmsg (format ("You inflict %s on %s!", &disease->name, &walk->name));
 
                     disease->destroy ();      /* don't need this one anymore */
                     walk->map->insert (get_archetype (shstr_detect_magic), x, y, op);