Changeset 376

Timestamp:

07/27/07 11:42:49 (1 year ago)

Author:

takkaria

Message:

Fix TR3_LITE flag behaviour on non-lights. (see #260)

Files:

• branches/angband-3.0.8/src/xtra1.c (modified) (5 diffs)

branches/angband-3.0.8/src/xtra1.c

@@ -1665 +1665 @@
-
-        s16b old_lite = p_ptr->cur_lite;
+        bool burn_light = TRUE;
+
-        s16b new_lite = 0;
-
+
+
-
-
@@ -1688 +1691 @@
-                object_flags(o_ptr, &f1, &f2, &f3);
-
-                /* LITE flag on an object always increases radius */
-                if (f3 & TR3_LITE) amt++;
-
-                /* Cursed objects emit no light */
-                if (o_ptr->ident & IDENT_CURSED)
@@ -1700 +1700 @@
-                else if (o_ptr->tval == TV_LITE)
-                {
+                        int flag_inc = (f3 & TR3_LITE) ? 1 : 0;
+
-                        /* Artifact Lites provide permanent bright light */
-                        if (artifact_p(o_ptr))
-+= 3
+= 3 + flag_inc
-
-                        /* Non-artifact lights and those without fuel provide no light */
-                        else if (!burn_light || o_ptr->timeout == 0)
-    
+       
-
-                        /* All lit lights provide at least radius 2 light */
-                        else
-                        {
-+= 2
+= 2 + flag_inc
-
-                                /* Torches below half fuel provide less light */
@@ -1719 +1721 @@
-                }
-
+                else
+                {
+                        /* LITE flag on an non-cursed non-lights always increases radius */
+                        if (f3 & TR3_LITE) extra_lite++;
+                }
+
-                /* Alter p_ptr->cur_lite if reasonable */
-                if (new_lite < amt)
@@ -1724 +1732 @@
-        }
-
-
-
+
+
+
+
+
-        new_lite = MAX(new_lite, 0);
-