Changeset 717

Timestamp:

02/26/08 04:35:02 (6 months ago)

Author:

takkaria

Message:

Fix #450:

• Enable level feelings again.
  
• Use the OAngband level feeling algorithm. This seems like it might weight things a bit better.
  
• Add a birth option to control whether feelings appear or not. Expect it gone by 3.2.
  

Files:

• trunk/src/cmd4.c (modified) (1 diff)
• trunk/src/generate.c (modified) (1 diff)
• trunk/src/option.c (modified) (3 diffs)
• trunk/src/option.h (modified) (2 diffs)

trunk/src/cmd4.c

@@ -4323 +4323 @@
-void do_cmd_feeling(void)
-{
+        /* Don't show feelings for cold-hearted characters */
+        if (OPT(birth_feelings)) return;
+
-        /* Verify the feeling */
-        if (feeling >= N_ELEMENTS(feeling_text))

trunk/src/generate.c

@@ -3393 +3393 @@
-
-        /* Town gets no feeling */
-!
+
-
-#if 0

trunk/src/option.c

@@ -85 +85 @@
-                OPT_birth_maximize,
-                OPT_birth_randarts,
+                OPT_birth_ai_sound,
+                OPT_birth_ai_smell,
+                OPT_birth_ai_packs,
+                OPT_birth_ai_learn,
+                OPT_birth_ai_cheat,
+                OPT_birth_ai_smart,
-                OPT_birth_ironman,
-                OPT_birth_no_stores,
@@ -91 +97 @@
-                OPT_birth_no_preserve,
-                OPT_birth_no_stairs,
-
-
-
-
-
-
-
+
-        },
-
@@ -267 +267 @@
-{ "birth_no_preserve",   "Lose artifacts when leaving level",           FALSE }, /* 135 */
-{ "birth_no_stairs",     "Don't generate connected stairs",             FALSE }, /* 136 */
-NULL,                  NULL,                       
+"birth_feelings",      "Don't show level feelings",
-{ NULL,                  NULL,                                          FALSE }, /* 138 */
-{ NULL,                  NULL,                                          FALSE }, /* 139 */

trunk/src/option.h

@@ -92 +92 @@
-#define OPT_birth_no_preserve       (OPT_BIRTH+7)
-#define OPT_birth_no_stairs                     (OPT_BIRTH+8)
+#define OPT_birth_feelings                              (OPT_BIRTH+9)
-/* leave four spaces for future */
-#define OPT_birth_ai_sound                      (OPT_BIRTH+13)
@@ -115 +116 @@
-#define OPT_adult_no_preserve       (OPT_ADULT+7)
-#define OPT_adult_no_stairs                     (OPT_ADULT+8)
+#define OPT_adult_feelings                              (OPT_ADULT+9)
-/* leave four spaces for future */
-#define OPT_adult_ai_sound                      (OPT_ADULT+13)