Changeset 518

Timestamp:

08/12/07 13:01:56 (1 year ago)

Author:

takkaria

Message:

Remove the MONSTER_AI define (turn it on always).

Files:

• trunk/src/config.h (modified) (1 diff)
• trunk/src/melee2.c (modified) (21 diffs)

trunk/src/config.h

@@ -114 +114 @@
-#define MONSTER_FLOW
-
-
-
-/*
- * OPTION: Allow use of the "adult_ai_smart" and "adult_ai_packs"
- * software options, which attempt to make monsters smarter.
- *
- * AI code by Keldon Jones (keldon@umr.edu), modified by Julian
- * Lighton (jl8e@fragment.com).
- */
-#define MONSTER_AI
-
-

trunk/src/melee2.c

@@ -325 +325 @@
-
-
-#ifdef MONSTER_AI
-
-/*
- * Determine if there is a space near the selected spot in which
@@ -397 +395 @@
-}
-
-#endif /* MONSTER_AI */
-
-
@@ -475 +472 @@
-
-        int i, py = p_ptr->py, px = p_ptr->px;
-
-#ifdef MONSTER_AI
-
-        bool has_escape, has_attack, has_summon, has_tactic;
@@ -604 +599 @@
-        }
-
-#endif /* MONSTER_AI */
-
-        /* Extract the "innate" spells */
-        for (i = 0; i < 32; i++)
@@ -684 +677 @@
-        int k, chance, thrown_spell, rlev;
-
-#ifdef MONSTER_AI
-        int failrate;
-#endif /* MONSTER_AI */
-
-        u32b f4, f5, f6;
@@ -780 +771 @@
-
-#endif /* DRS_SMART_OPTIONS */
-
-#ifdef MONSTER_AI
-
-        /* Check whether summons and bolts are worth it. */
@@ -810 +799 @@
-                if (!f4 && !f5 && !f6) return (FALSE);
-        }
-#endif /* MONSTER_AI */
-
-        /* Handle "leaving" */
@@ -832 +820 @@
-        if (!thrown_spell) return (FALSE);
-
-#ifdef MONSTER_AI
-        /* Calculate spell failure rate */
-        failrate = 25 - (rlev + 3) / 4;
@@ -847 +834 @@
-                return (TRUE);
-        }
-#endif /* MONSTER_AI */
-
-        /* Cast the spell. */
@@ -2479 +2465 @@
-}
-
-#ifdef MONSTER_AI
-
-/*
- * Provide a location to flee to, but give the player a wide berth.
@@ -2570 +2554 @@
-}
-
-#endif /* MONSTER_AI */
-
-#endif /* MONSTER_FLOW */
-
-
-#ifdef MONSTER_AI
-
-/*
@@ -2712 +2693 @@
-};
-
-#endif /* MONSTER_AI */
-
-
-/*
@@ -2730 +2709 @@
-{
-
-#ifdef MONSTER_AI
-#ifdef MONSTER_FLOW
-
@@ -2807 +2785 @@
-
-#endif /* MONSTER_FLOW */
-#endif /* MONSTER_AI */
-
-        /* No safe place */
@@ -2814 +2791 @@
-
-
-
+
-
-/*
@@ -2895 +2872 @@
-}
-
-#endif /* MONSTER_AI */
-
-
-/*
@@ -2936 +2911 @@
-
-
-#ifdef MONSTER_AI
-
-        /* Normal animal packs try to get the player out of corridors. */
@@ -2966 +2940 @@
-        }
-
-#endif /* MONSTER_AI */
-
-        /* Apply fear */
@@ -2979 +2952 @@
-                }
-
-#ifdef MONSTER_AI
-#ifdef MONSTER_FLOW
-
@@ -2993 +2965 @@
-
-#endif /* MONSTER_FLOW */
-#endif /* MONSTER_AI */
-
-                done = TRUE;
-        }
-
-
-#ifdef MONSTER_AI
-
-        /* Monster groups try to surround the player */
@@ -3034 +3003 @@
-                x = m_ptr->fx - x2;
-        }
-
-#endif /* MONSTER_AI */
-
-