summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/dat/speak.txt6
-rw-r--r--crawl-ref/source/terrain.cc2
2 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/dat/speak.txt b/crawl-ref/source/dat/speak.txt
index 76214f39ac..3d501b0bcb 100644
--- a/crawl-ref/source/dat/speak.txt
+++ b/crawl-ref/source/dat/speak.txt
@@ -1898,7 +1898,7 @@ weapon_sings
@The_weapon@ merrily whistles a melody.
-In a hysteric voice, @the_weapon@ strikes up a march.
+In a hysterical voice, @the_weapon@ strikes up a march.
@The_weapon@ sings @several@ chords at once.
@@ -1912,7 +1912,7 @@ In a hysteric voice, @the_weapon@ strikes up a march.
@The_weapon@ strikes up a @dance@.
-@The_weapon@ intonates @an_aria_or_fugue@.
+@The_weapon@ intones @an_aria_or_fugue@.
@The_weapon@ @nearly_or_clearly@ @hits_or_misses@ the concert pitch.
@@ -2304,4 +2304,4 @@ double_or_triple
double
triple
-%%%% \ No newline at end of file
+%%%%
diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc
index 31e0c52308..7611b3af25 100644
--- a/crawl-ref/source/terrain.cc
+++ b/crawl-ref/source/terrain.cc
@@ -377,7 +377,7 @@ static void dgn_check_terrain_items(const coord_def &pos, bool preserve_items)
dgn_shift_item(pos, mitm[curr]);
else
{
- item_was_destroyed(mitm[item]);
+ item_was_destroyed(mitm[curr]);
destroy_item(curr);
did_destroy = true;
}