pat wrote:

> In the development code, two status types have gotten reversed.
> Hallucinating shows up as "Stun" and being stunned shows up as "Hallu".

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index 67251ff301529f41b729f2b4dc36dcbe46fb7fc1..8d98d78625b41cf8bd05c99d7a4d121c5b991752 100644 (file)
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -8,7 +8,6 @@ wizard mode: avoid division by 0 crash for level teleport in the endgame if
        confusion overrides teleport control
 don't #sit on an object in a pit if you're only on the precipice
 fix message when pushing a boulder into a pool while riding
-when you're teetering on the edge of a pit you can use '>' to enter the pit
 plural of "Nazgul" is "Nazgul" not "Nazguls"
 trap messages referring to named steed were ackwardly worded when hallucination
        overrode use of the name
@@ -20,6 +19,7 @@ Platform- and/or Interface-Specific Fixes
 
 General New Features
 --------------------
+when you're teetering on the edge of a pit you can use '>' to enter the pit
 
 
 Platform- and/or Interface-Specific New Features

diff --git a/src/botl.c b/src/botl.c
index ed0ed264eb21526e05d6c5d9d4fe48a9c3fd7848..17ec579c61ee85a31bff69fe56140a412d38db3e 100644 (file)
--- a/src/botl.c
+++ b/src/botl.c
@@ -1412,8 +1412,8 @@ genericptr_t ptr;
                        if (cond & BL_MASK_FOODPOIS)
                                        Strcat(vals[idx], " FoodPois");
                        if (cond & BL_MASK_ILL) Strcat(vals[idx], " Ill");
-                       if (cond & BL_MASK_STUNNED) Strcat(vals[idx], " Hallu");
-                       if (cond & BL_MASK_HALLU) Strcat(vals[idx], " Stun");
+                       if (cond & BL_MASK_STUNNED) Strcat(vals[idx], " Stun");
+                       if (cond & BL_MASK_HALLU) Strcat(vals[idx], " Hallu");
                        if (cond & BL_MASK_SLIMED) Strcat(vals[idx], " Slime");
                        break;
                default: