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

Comparing deliantra/server/server/rune.C (file contents):
Revision 1.43 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.55 by root, Mon Oct 29 23:55:55 2012 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,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2003 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.
  *
  * 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
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
 #include <sproto.h>
       new_draw_info (NDI_UNIQUE, 0, op, "You can't write a rune on top of another rune.");
       return 0;
     }
   if (spell->other_arch)
-    rune_spell = arch_to_object (spell->other_arch);
+    rune_spell = spell->other_arch->instance ();
   else
     {
       /* Player specified spell.  The player has to know the spell, so
        * lets just look through the players inventory see if they know it
        * use the item_matched_string for our typical matching method.
   /* already proper rune.  Note this should only be the case if other_arch was set */
   if (rune_spell->type == RUNE)
     rune = rune_spell;
   else
     {
-      rune = get_archetype (GENERIC_RUNE);
+      rune = archetype::get (GENERIC_RUNE);
       rune->msg = format ("You set off a rune of %s\n", &rune_spell->name);
       rune->insert (rune_spell->clone ());
       if (spell->face != blank_face)
         rune->face = spell->face;
   if (!op->level)
     return;
   int det = op->invisible;
-  if (!(rndm (0, MAX (1, (op->stats.Cha)) - 1)))
+  if (!(rndm (0, max (0, op->stats.Cha - 1))))
     {
       op->invisible = 0;
       op->speed_left -= 1;
     }
   else
 }
 /*  peterm: rune_attack
  * function handles those runes which detonate but do not cast spells.
  */
-void
+static void
 rune_attack (object *op, object *victim)
 {
   if (victim)
     {
       hit_player (victim, op->stats.dam, op, op->attacktype, 1);
   /* Prevent recursion */
   if (trap->stats.hp <= 0)
     return;
-  if (QUERY_FLAG (trap, FLAG_IS_LINKED))
+  if (trap->flag [FLAG_IS_LINKED])
     use_trigger (trap, victim);
   /* Only living objects can trigger runes that don't cast spells, as
    * doing direct damage to a non-living object doesn't work anyway.
    * Typical example is an arrow attacking a door.
    */
-  if (!QUERY_FLAG (victim, FLAG_ALIVE) && !trap->inv && !trap->other_arch)
+  if (!victim->flag [FLAG_ALIVE] && !trap->inv && !trap->other_arch)
     return;
   trap->stats.hp--;             /*decrement detcount */
   if (victim && victim->type == PLAYER)
       // do not work like summon golem spells at all but still require
       // direction "0" to work at all.
       //if (trap->direction)
       //  rv.direction = trap->direction;
-      for (i = 0; i < MAX (1, trap->stats.maxhp); i++)
+      for (i = 0; i < max (1, trap->stats.maxhp); i++)
         {
           if (trap->inv)
             cast_spell (env, trap, trap->direction, trap->inv, NULL);
           else
             {
-              object *spell = arch_to_object (trap->other_arch);
+              object *spell = trap->other_arch->instance ();
               cast_spell (env, trap, trap->direction, spell, NULL);
               spell->destroy ();
             }
         }
   if (trap->stats.hp <= 0)
     {
       trap->type = SIGN;        /* make the trap impotent */
       trap->stats.food = 20;    /* make it stick around until its spells are gone */
-      SET_FLAG (trap, FLAG_IS_USED_UP);
+      trap->set_flag (FLAG_IS_USED_UP);
     }
 }
 /* dispel_rune:  by peterm
  * dispels the target rune, depending on the level of the actor
 }
 int
 trap_see (object *op, object *trap)
 {
-  int chance;
-  chance = random_roll (0, 99, op, PREFER_HIGH);;
+  int chance = random_roll (0, 99, op, PREFER_HIGH);
   /*  decide if we see the rune or not */
-  if ((trap->stats.Cha == 1) || (chance > MIN (95, MAX (5, ((int) ((float) (op->map->difficulty
+  if ((trap->stats.Cha == 1) || (chance > min (95, max (5, ((int) ((float) (op->map->difficulty
                                                                             + trap->level + trap->stats.Cha - op->level) / 10.0 * 50.0))))))
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "You spot a %s!", &trap->name);
       return 1;
     }
 trap_show (object *trap, object *where)
 {
   if (where == NULL)
     return 0;
-  object *tmp = get_archetype ("runedet");
+  object *tmp = archetype::get (shstr_runedet);
   tmp->face = trap->get_anim_frame (0);
   tmp->insert_at (where, 0);
   return 1;
 }
 trap_disarm (object *disarmer, object *trap, int risk, object *skill)
 {
   int trapworth; /* need to compute the experience worth of the trap before we kill it */
   /* this formula awards a more reasonable amount of exp */
-  trapworth = MAX (1, trap->level)
+  trapworth = max (1, trap->level)
             * disarmer->map->difficulty
-            * sqr (MAX (trap->stats.dam, trap->inv ? trap->inv->level : 1))
+            * sqr (max (trap->stats.dam, trap->inv ? trap->inv->level : 1))
             / skill->level;
-  if (!(random_roll (0, (MAX (2, MIN (20, trap->level - skill->level + 5 - disarmer->stats.Dex / 2)) - 1), disarmer, PREFER_LOW)))
+  if (!(random_roll (0, (max (2, min (20, trap->level - skill->level + 5 - disarmer->stats.Dex / 2)) - 1), disarmer, PREFER_LOW)))
     {
       new_draw_info_format (NDI_UNIQUE, 0, disarmer, "You successfully disarm the %s!", &trap->name);
       trap->destroy ();
       /* If it is your own trap, (or any players trap), don't you don't
         return 1;               /* give minimal exp and say success */
     }
   else
     {
       new_draw_info_format (NDI_UNIQUE, 0, disarmer, "You fail to disarm the %s.", &trap->name);
-      if (!(random_roll (0, (MAX (2, skill->level - trap->level + disarmer->stats.Dex / 2 - 6)) - 1, disarmer, PREFER_LOW)) && risk)
+      if (!(random_roll (0, (max (2, skill->level - trap->level + disarmer->stats.Dex / 2 - 6)) - 1, disarmer, PREFER_LOW)) && risk)
         {
           new_draw_info (NDI_UNIQUE, 0, disarmer, "In fact, you set it off!");
           spring_trap (trap, disarmer);
         }
       return 0;

Diff Legend

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

Comparing deliantra/server/server/rune.C (file contents): Revision 1.43 by root, Mon Oct 12 14:00:59 2009 UTC vs. Revision 1.55 by root, Mon Oct 29 23:55:55 2012 UTC

Diff Legend

Comparing deliantra/server/server/rune.C (file contents):
Revision 1.43 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.55 by root, Mon Oct 29 23:55:55 2012 UTC