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

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.37 by root, Wed Aug 22 20:46:46 2007 UTC vs.
Revision 1.45 by root, Sun Nov 16 03:52:13 2008 UTC

 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the 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,
  * GNU General Public License for more details.
  *
  * You should have received a copy of 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 <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
 #include <sproto.h>
 #include <spells.h>
       if (!check_wakeup (op, enemy, &rv))
         return 0;
     }
   /* check if monster pops out of hidden spot */
-  if (op->hide)
+  if (op->flag [FLAG_HIDDEN])
     do_hidden_move (op);
   if (op->pick_up)
     monster_check_pickup (op);
   /* If we don't have an enemy, do special movement or the like */
   if (!enemy)
     {
       if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
         {
-          op->destroy ();
+          op->drop_and_destroy ();
           return 1;
         }
       /* Probably really a bug for a creature to have both
        * stand still and a movement type set.
   if (QUERY_FLAG (part, FLAG_FREED))    /* Might be freed by ghost-attack or hit-back */
     return 1;
   if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
     {
-      op->remove ();
-      op->destroy ();
+      op->drop_and_destroy ();
       return 1;
     }
   return 0;
 }
 int
 can_hit (object *ob1, object *ob2, rv_vector * rv)
   /* use this for invis also */
   hide_discovery = op->stats.Int / 5;
   /* Determine Detection radii */
-  if (!enemy->hide)             /* to detect non-hidden (eg dark/invis enemy) */
+  if (!enemy->flag [FLAG_HIDDEN])             /* to detect non-hidden (eg dark/invis enemy) */
     radius = max (MIN_MON_RADIUS, op->stats.Wis / 5 + 1);
   else
     {                           /* a level/INT/Dex adjustment for hiding */
       int bonus = op->level / 2 + op->stats.Int / 5;
   // note that the above reasoning was utter bullshit even at the time it was written
   // we use 25, lets see if we have the cpu time for it
   radius = min (25, radius);
   /* Enemy in range! Now test for detection */
-  if ((int) rv->distance <= radius)
+  if (rv->distance <= radius)
     {
       /* ah, we are within range, detected? take cases */
       if (!enemy->invisible)    /* enemy in dark squares... are seen! */
         return 1;
       /* hidden or low-quality invisible */
-      if (enemy->hide && rv->distance <= 1 && rndm (100) <= hide_discovery)
+      if (enemy->flag [FLAG_HIDDEN] && rv->distance <= 1 && rndm (100) <= hide_discovery)
         {
           make_visible (enemy);
           /* inform players of new status */
           if (enemy->type == PLAYER && player_can_view (enemy, op))
  * other side of a wall (!).
  */
 int
 stand_in_light (object *op)
 {
-  sint16 nx, ny;
-  maptile *m;
   if (!op)
     return 0;
   if (op->glow_radius > 0)
     return 1;
   if (op->map)
     {
-      int x, y, x1, y1;
       /* Check the spaces with the max light radius to see if any of them
        * have lights, and if any of them light the player enough, then return 1.
        */
-      for (x = op->x - MAX_LIGHT_RADII; x <= op->x + MAX_LIGHT_RADII; x++)
+      for (int x = op->x - MAX_LIGHT_RADII; x <= op->x + MAX_LIGHT_RADII; x++)
         {
-          for (y = op->y - MAX_LIGHT_RADII; y <= op->y + MAX_LIGHT_RADII; y++)
+          for (int y = op->y - MAX_LIGHT_RADII; y <= op->y + MAX_LIGHT_RADII; y++)
             {
-              m = op->map;
+              maptile *m = op->map;
-              nx = x;
+              sint16 nx = x;
-              ny = y;
+              sint16 ny = y;
-              if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP)
+              if (xy_normalise (m, nx, ny))
-                continue;
+                if (idistance (x - op->x, y - op->y) < m->at (nx, ny).light)
-              x1 = abs (x - op->x) * abs (x - op->x);
-              y1 = abs (y - op->y) * abs (y - op->y);
-              if (isqrt (x1 + y1) < GET_MAP_LIGHT (m, nx, ny))
-                return 1;
+                  return 1;
             }
         }
     }
   return 0;
        * However,if you carry any source of light, then the hidden
        * creature is seeable (and stupid) */
       if (has_carried_lights (enemy))
         {
-          if (enemy->hide)
+          if (enemy->flag [FLAG_HIDDEN])
             {
               make_visible (enemy);
               new_draw_info (NDI_UNIQUE, 0, enemy, "Your light reveals your hiding spot!");
             }
           return 1;
         }
-      else if (enemy->hide)
+      else if (enemy->flag [FLAG_HIDDEN])
         return 0;
       /* Invisible enemy.  Break apart the check for invis undead/invis looker
        * into more simple checks - the QUERY_FLAG doesn't return 1/0 values,
        * and making it a conditional makes the code pretty ugly.
        */
       if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE))
-        {
-          if (makes_invisible_to (enemy, looker))
+        if (makes_invisible_to (enemy, looker))
-            return 0;
+          return 0;
-        }
     }
   else if (looker->type == PLAYER)      /* for players, a (possible) shortcut */
     if (player_can_view (looker, enemy))
       return 1;
       && (!QUERY_FLAG (looker, FLAG_SEE_IN_DARK) || !is_true_undead (looker) || !QUERY_FLAG (looker, FLAG_XRAYS)))
     return 0;
   return 1;
 }

Diff Legend

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

Comparing deliantra/server/server/monster.C (file contents): Revision 1.37 by root, Wed Aug 22 20:46:46 2007 UTC vs. Revision 1.45 by root, Sun Nov 16 03:52:13 2008 UTC

Diff Legend

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.37 by root, Wed Aug 22 20:46:46 2007 UTC vs.
Revision 1.45 by root, Sun Nov 16 03:52:13 2008 UTC