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

Comparing deliantra/server/server/disease.C (file contents):
Revision 1.59 by root, Mon Nov 23 14:09:05 2009 UTC vs.
Revision 1.68 by root, Sun May 1 16:58:17 2011 UTC

 /*
  * 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 (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 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.
   if (disease->last_heal)
     return 0;
   /*  first, search for an immunity of the same name */
   for (walk = disease->env->inv; walk; walk = walk->below)
-    if (walk->type == 98 && disease->name == walk->name)
+    if (disease->name == walk->name && walk->is_immunity ())
       {
         walk->level = disease->level;
         return 1;             /* just update the existing immunity. */
       }
-  immunity = get_archetype (shstr_immunity);
+  immunity = archetype::get (shstr_immunity);
   immunity->name       = disease->name;
   immunity->level      = disease->level;
   immunity->move_block = 0;
   object *op = disease->outer_env_or_self ();
   if (!op->is_on_map ())
     return 0;
+  dynbuf buf;
-  unordered_mapwalk (op, -range, -range, range, range)
+  unordered_mapwalk (buf, op, -range, -range, range, range)
     {
       mapspace &ms = m->at (nx, ny);
       if (ms.flags () & P_IS_ALIVE)
         for (object *tmp = ms.bot; tmp; tmp = tmp->above)
 /* check if victim is susceptible to disease. */
 static int
 is_susceptible_to_disease (object *victim, object *disease)
 {
-  if (!QUERY_FLAG (victim, FLAG_ALIVE))
+  if (!victim->flag [FLAG_ALIVE])
     return 0;
   if (victim->flag [FLAG_WIZ])
     return 0;
-  if (disease->race.contains ("*") && !QUERY_FLAG (victim, FLAG_UNDEAD))
+  if (disease->race.contains ("*") && !victim->flag [FLAG_UNDEAD])
     return 1;
-  if ((disease->race == shstr_undead) && QUERY_FLAG (victim, FLAG_UNDEAD))
+  if ((disease->race == shstr_undead) && victim->flag [FLAG_UNDEAD])
     return 1;
   if ((victim->race && disease->race.contains (victim->race)) || disease->race.contains (victim->name))
     return 1;
         return 0;
       /* check for an actual immunity */
       /* do an immunity check */
       for (tmp = victim->head_ ()->inv; tmp; tmp = tmp->below)
-        if (tmp->type == SIGN)        /* possibly an immunity, or diseased */
+        if (tmp->name == disease->name && tmp->is_immunity ())        /* possibly an immunity, or diseased */
-          if (tmp->name == disease->name && tmp->level >= disease->level)
+          if (tmp->level >= disease->level)
             return 0;         /* Immune! */
-      object *new_symptom = get_archetype (shstr_symptom);
+      object *new_symptom = archetype::get (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.
        */
       new_symptom->stats.food  = new_symptom->stats.maxgrace;
       new_symptom->name = new_symptom->name_pl = disease->name;
       new_symptom->level = disease->level;
-      new_symptom->speed = disease->speed;
       new_symptom->value = 0;
+      new_symptom->set_speed (disease->speed);
       for (int i = 0; i < NUM_STATS; ++i)
         new_symptom->stats.stat (i) = disease->stats.stat (i);
       new_symptom->stats.sp    = disease->stats.sp;
       symptom->msg         = disease->msg;
       symptom->attacktype  = disease->attacktype;
       symptom->other_arch  = disease->other_arch;
     }
-  SET_FLAG (symptom, FLAG_APPLIED);
+  symptom->set_flag (FLAG_APPLIED);
   victim->update_stats ();
   return 1;
 }
 {
   object *tmp;
   object *new_disease;
   /* don't infect inanimate objects */
-  if (!QUERY_FLAG (victim, FLAG_MONSTER) && !(victim->type == PLAYER))
+  if (!victim->flag [FLAG_MONSTER] && !(victim->type == PLAYER))
     return 0;
   /* check and see if victim can catch disease:  diseases
    *  are specific
    */
    * they were cast in that same order.  Instead, change it so that
    * if you diseased, you can't get diseased more.
    */
   for (tmp = victim->head_ ()->inv; tmp; tmp = tmp->below)
-    if (tmp->type == SIGN && tmp->name == disease->name && tmp->level >= disease->level)
+    if (tmp->name == disease->name && tmp->is_immunity () && tmp->level >= disease->level)
       return 0;               /* Immune! */
     else if (tmp->type == DISEASE && tmp->name == disease->name)
       return 0;               /* already diseased */
   /*  If we've gotten this far, go ahead and infect the victim.  */
       victim->play_sound (symptom->sound);
       if (symptom->other_arch)
         for (object *tmp = victim->head_ (); tmp; tmp = tmp->more)
           {
-            object *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);
           }

Diff Legend

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

Comparing deliantra/server/server/disease.C (file contents): Revision 1.59 by root, Mon Nov 23 14:09:05 2009 UTC vs. Revision 1.68 by root, Sun May 1 16:58:17 2011 UTC

Diff Legend

Comparing deliantra/server/server/disease.C (file contents):
Revision 1.59 by root, Mon Nov 23 14:09:05 2009 UTC vs.
Revision 1.68 by root, Sun May 1 16:58:17 2011 UTC