[ViewVC] Diff of: cvs/deliantra/server/server/disease.C

Comparing deliantra/server/server/disease.C (file contents):
Revision 1.52 by root, Tue Sep 1 20:56:05 2009 UTC vs.
Revision 1.60 by root, Sun Nov 29 17:41:08 2009 UTC

  *
  * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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 GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /* This file contains all the code implementing diseases,
       {
         walk->level = disease->level;
         return 1;             /* just update the existing immunity. */
       }
-  immunity = get_archetype ("immunity");
+  immunity = get_archetype (shstr_immunity);
   immunity->name       = disease->name;
   immunity->level      = disease->level;
   immunity->move_block = 0;
       for (tmp = victim->head_ ()->inv; tmp; tmp = tmp->below)
         if (tmp->type == SIGN)        /* possibly an immunity, or diseased */
           if (tmp->name == disease->name && tmp->level >= disease->level)
             return 0;         /* Immune! */
-      object *new_symptom = get_archetype ("symptom");
+      object *new_symptom = get_archetype (shstr_symptom);
       /* Something special done with dam.  We want diseases to be more
        * random in what they'll kill, so we'll make the damage they
        * do random, note, this has a weird effect with progressive diseases.
        */
 /*  make the symptom do the nasty things it does  */
 int
 move_symptom (object *symptom)
 {
   object *victim = symptom->env;
-  object *new_ob;
-  int sp_reduce;
   if (!victim || !victim->map)
     {                           /* outside a monster/player, die immediately */
       symptom->destroy ();
       return 0;
     }
-  if (symptom->stats.dam > 0)
-    hit_player (victim, symptom->stats.dam, symptom, symptom->attacktype, 1);
-  else
-    hit_player (victim, max (1, -victim->stats.maxhp * symptom->stats.dam / 100), symptom, symptom->attacktype, 1);
-  if (symptom->stats.maxsp > 0)
-    sp_reduce = symptom->stats.maxsp;
-  else
-    sp_reduce = max (1, victim->stats.maxsp * symptom->stats.maxsp / 100);
-  victim->stats.sp = max (0, victim->stats.sp - sp_reduce);
   /* create the symptom "other arch" object and drop it here
    * under every part of the monster
    * The victim may well have died.
    */
       victim->play_sound (symptom->sound);
       if (symptom->other_arch)
         for (object *tmp = victim->head_ (); tmp; tmp = tmp->more)
           {
-            new_ob = arch_to_object (symptom->other_arch);
+            object *new_ob = symptom->other_arch->instance ();
             new_ob->x = tmp->x;
             new_ob->y = tmp->y;
             new_ob->map = victim->map;
             insert_ob_in_map (new_ob, victim->map, victim, 0);
           }
     }
+  int damage =
+     symptom->stats.dam > 0
+       ? symptom->stats.dam
+       : max (1, victim->stats.maxhp * -symptom->stats.dam / 100);
+  hit_player (victim, damage, symptom, symptom->attacktype, 1);
+  int sp_reduce =
+     symptom->stats.maxsp > 0
+       ? symptom->stats.maxsp
+       : max (1, victim->stats.maxsp * -symptom->stats.maxsp / 100);
+  victim->stats.sp = max (0, victim->stats.sp - sp_reduce);
   new_draw_info (NDI_UNIQUE | NDI_RED, 0, victim, symptom->msg);
   return 1;
 }
   for (object *disease = hitter->inv; disease; disease = disease->below)
     if (disease->type == DISEASE)
       infect_object (victim, disease, 0);
   return 1;
-}
-// find a disease in someone
-object *
-find_disease (object *victim)
-{
-  for (object *disease = victim->inv; disease; disease = disease->below)
-    if (disease->type == DISEASE)
-      return disease;
-  return 0;
 }
 /* do the cure disease stuff, from the spell "cure disease" */
 int
 cure_disease (object *sufferer, object *caster, object *spell)
     }
   return 1;
 }
+#if 0 // unused, but seems interesting
 /* reduces disease progression:  reduce_symptoms
  * return true if we actually reduce a disease.
  */
-int
+static int
 reduce_symptoms (object *sufferer, int reduction)
 {
   object *walk;
   int success = 0;
   if (success)
     new_draw_info (NDI_UNIQUE, 0, sufferer, "Your illness seems less severe.");
   return success;
 }
+#endif

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/disease.C (file contents): Revision 1.52 by root, Tue Sep 1 20:56:05 2009 UTC vs. Revision 1.60 by root, Sun Nov 29 17:41:08 2009 UTC

Diff Legend

Comparing deliantra/server/server/disease.C (file contents):
Revision 1.52 by root, Tue Sep 1 20:56:05 2009 UTC vs.
Revision 1.60 by root, Sun Nov 29 17:41:08 2009 UTC