Changeset 796

Timestamp:

03/19/08 15:27:14 (5 months ago)

Author:

GabeCunningham

Message:

Fix #409: Reading a Scroll of Rune of Protection off the floor now correctly deletes the scroll and makes you aware of the item flavor.

Files:

• trunk/src/cmd6.c (modified) (5 diffs)
• trunk/src/spells2.c (modified) (2 diffs)

trunk/src/cmd6.c

@@ -120 +120 @@
-        bool was_aware = object_aware_p(o_ptr);
-        int dir = 5;
+        int px = p_ptr->px, py = p_ptr->py;
-
-        /* Figure out effect to use */
@@ -197 +198 @@
-        }
-
-
-        /* Some uses are "free" */
-        if (!used) return;
-
-        /* Chargeables act differently to single-used items when not used up */
-
+d && use
-        {
-                /* Use a single charge */
@@ -213 +210 @@
-                        floor_item_charges(0 - item);
-        }
-
+d && use
-        {
-                /* Artifacts use their own special field */
@@ -227 +224 @@
-                }
-        }
-
+d && use
-        {
-                /* Destroy a potion in the pack */
@@ -245 +242 @@
-                }
-        }
+        
+        /* Hack to make Glyph of Warding work properly */
+        if (cave_feat[py][px] == FEAT_GLYPH)
+        {
+                /* Shift any objects to further away */
+                for (o_ptr = get_first_object(py, px); o_ptr; o_ptr = get_next_object(o_ptr))
+                {
+                        drop_near(o_ptr, 0, py, px);
+                }
+                
+                /* Delete the "moved" objects from their original position */
+                delete_object(py, px);
+        }
+
+        
-}

trunk/src/spells2.c

@@ -98 +98 @@
-void warding_glyph(void)
-{
-        object_type *o_ptr;
-        int py = p_ptr->py;
-        int px = p_ptr->px;
@@ -110 +109 @@
-        /* Create a glyph */
-        cave_set_feat(py, px, FEAT_GLYPH);
-
-        /* Shift any objects to further away */
-        for (o_ptr = get_first_object(py, px); o_ptr; o_ptr = get_next_object(o_ptr))
-        {
-                drop_near(o_ptr, 0, py, px);
-        }
-
-        /* Delete the "moved" objects from their original position */
-        delete_object(py, px);
-}
-