Apply trunk r6759 to 0.4.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6767 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 4 deletions

diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 05850e6ef0..159b55b263 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1729,10 +1729,13 @@ bool acquirement(object_class_type class_wanted, int agent,
             thing.inscription = "god gift";
             if (is_random_artefact(thing))
             {
-                origin_acquired(mitm[thing_created], agent);
-                // give another name that takes god gift into account
-                thing.props["randart_name"].get_string() =
-                    randart_name(thing, false);
+                origin_acquired(thing, agent);
+                if ( !is_unrandom_artefact(thing) )
+                {
+                    // give another name that takes god gift into account
+                    thing.props["randart_name"].get_string() =
+                        randart_name(thing, false);
+                }
             }
         }
         move_item_to_grid( &thing_created, you.x_pos, you.y_pos );