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

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.57 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.58 by root, Sun Dec 28 08:56:44 2008 UTC

 {
   /* Trim work - if no enemy, no need to do anything below */
   if (!enemy)
     return 0;
+  if (!op->flag [FLAG_SLEEP])
+    return 1;
   int radius = max (op->stats.Wis, MIN_MON_RADIUS);
   if (op->flag [FLAG_BLIND])
     /* blinded monsters can only find nearby objects to attack */
     radius = MIN_MON_RADIUS;
      * and has an enemy. If the enemy has no carried light (or isnt
      * glowing!) then the monster has trouble finding the enemy.
      * Remember we already checked to see if the monster can see in
      * the dark. */
     radius = min (radius, MIN_MON_RADIUS + MAX_DARKNESS - op->map->darklevel ());
-  else if (!op->flag [FLAG_SLEEP])
-    return 1;
   if (enemy->flag [FLAG_STEALTH])
     radius = radius / 2 + 1;
   /* enemy should already be on this map, so don't really need to check
  * Returns 0 if enemy can not be detected, 1 if it is detected
  */
 int
 can_detect_enemy (object *op, object *enemy, rv_vector * rv)
 {
-  int radius = MIN_MON_RADIUS, hide_discovery;
   /* null detection for any of these condtions always */
   if (!op || !enemy || !op->map || !enemy->map)
     return 0;
   /* If the monster (op) has no way to get to the enemy, do nothing */
     return 0;
   get_rangevector (op, enemy, rv, 0);
   /* Monsters always ignore the DM */
-  if (op->type != PLAYER && QUERY_FLAG (enemy, FLAG_WIZ))
+  if (!op->is_player () && QUERY_FLAG (enemy, FLAG_WIZ))
     return 0;
   /* simple check.  Should probably put some range checks in here. */
   if (can_see_enemy (op, enemy))
     return 1;
   /* The rest of this is for monsters. Players are on their own for
    * finding enemies!
    */
-  if (op->type == PLAYER)
+  if (op->is_player ())
     return 0;
   /* Quality invisible? Bah, we wont see them w/o SEE_INVISIBLE
-   * flag (which was already checked) in can_see_enmy (). Lets get out of here
+   * flag (which was already checked) in can_see_enemy (). Lets get out of here
    */
   if (enemy->invisible && (!enemy->contr || (!enemy->contr->tmp_invis && !enemy->contr->hidden)))
     return 0;
+  int radius = MIN_MON_RADIUS;
   /* use this for invis also */
-  hide_discovery = op->stats.Int / 5;
+  int hide_discovery = op->stats.Int / 5;
   /* Determine Detection radii */
   if (!enemy->flag [FLAG_HIDDEN])             /* to detect non-hidden (eg dark/invis enemy) */
-    radius = max (MIN_MON_RADIUS, op->stats.Wis / 5 + 1);
+    radius = max (MIN_MON_RADIUS, op->stats.Wis / 3 + 1);
   else
     {                           /* a level/INT/Dex adjustment for hiding */
       int bonus = op->level / 2 + op->stats.Int / 5;
       if (enemy->is_player ())
       radius /= 2;
       hide_discovery /= 3;
     }
   /* Radii adjustment for enemy standing in the dark */
-  if (op->map->darklevel () > 0 && !stand_in_light (enemy))
+  if (!stand_in_light (enemy))
     {
       /* on dark maps body heat can help indicate location with infravision
        * undead don't have body heat, so no benefit detecting them.
        */
       if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !is_true_undead (enemy))
         radius -= op->map->darklevel () / 2;
       /* op next to a monster (and not in complete darkness)
        * the monster should have a chance to see you.
        */
-      if (radius < MIN_MON_RADIUS && op->map->darklevel () < 5 && rv->distance <= 1)
+      if (radius < MIN_MON_RADIUS && op->map->darklevel () < MAX_DARKNESS && rv->distance <= 1)
         radius = MIN_MON_RADIUS;
     }                           /* if on dark map */
   /* Lets not worry about monsters that have incredible detection
    * radii, we only need to worry here about things the player can
 int
 stand_in_light (object *op)
 {
   if (op)
     {
+      if (!op->is_on_map ())
+        return 0;
+      if (op->map->darklevel () <= 0)
+        return 1;
       if (op->glow_radius > 0)
         return 1;
       if (op->map)
         unordered_mapwalk (op, -MAX_LIGHT_RADIUS, -MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS)
    * we care about the enemy maps status, not the looker.
    * only relevant for tiled maps, but it is possible that the
    * enemy is on a bright map and the looker on a dark - in that
    * case, the looker can still see the enemy
    */
-  if (enemy->map->darklevel () > 0
-      && !stand_in_light (enemy)
+  if (!stand_in_light (enemy)
       && (!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.57 by root, Sun Dec 28 06:59:27 2008 UTC vs. Revision 1.58 by root, Sun Dec 28 08:56:44 2008 UTC

Diff Legend

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.57 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.58 by root, Sun Dec 28 08:56:44 2008 UTC