diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 16:24:19 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 16:24:19 +0000 |
commit | 2a2fa0501ba9b66b85d5c7c2070036d45eb2b79d (patch) | |
tree | 4422935aa761f3d4c49edafca953520f36f11e83 /crawl-ref | |
parent | 9112dd81fb46fbeeec6f46fe40ecaf1bcae42da3 (diff) | |
download | crawl-ref-2a2fa0501ba9b66b85d5c7c2070036d45eb2b79d.tar.gz crawl-ref-2a2fa0501ba9b66b85d5c7c2070036d45eb2b79d.zip |
Rename speak.txt to monspeak.txt, and noise.xt to wpnnoise.txt
as I keep thinking noise should refer to dungeon noises.
Also, fix a wrong variable name for orc speech.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3585 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/dat/database/monspeak.txt (renamed from crawl-ref/source/dat/database/speak.txt) | 2 | ||||
-rw-r--r-- | crawl-ref/source/dat/database/wpnnoise.txt (renamed from crawl-ref/source/dat/database/noise.txt) | 0 | ||||
-rw-r--r-- | crawl-ref/source/database.cc | 6 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/dat/database/speak.txt b/crawl-ref/source/dat/database/monspeak.txt index 04a820fb74..7922b99c80 100644 --- a/crawl-ref/source/dat/database/speak.txt +++ b/crawl-ref/source/dat/database/monspeak.txt @@ -2055,7 +2055,7 @@ w:5 @The_monster@ shouts, "All @orc_heathen@s must die!" -@The_monster@ @shouts@, "Let's @kill_or_maim@ those @heathen@s." +@The_monster@ @shouts@, "Let's @kill_or_maim@ those @orc_heathen@s." @The_monster@ @orc_says@, "With Beogh's help we'll overthrow the @orc_heathen@s!" diff --git a/crawl-ref/source/dat/database/noise.txt b/crawl-ref/source/dat/database/wpnnoise.txt index cdc9f0b2d2..cdc9f0b2d2 100644 --- a/crawl-ref/source/dat/database/noise.txt +++ b/crawl-ref/source/dat/database/wpnnoise.txt diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc index ee772c2b5b..853d5a9a4a 100644 --- a/crawl-ref/source/database.cc +++ b/crawl-ref/source/database.cc @@ -678,9 +678,9 @@ static std::vector<std::string> speak_txt_paths() std::vector<std::string> txt_file_names; std::vector<std::string> paths; - txt_file_names.push_back("speak"); // monster speech - txt_file_names.push_back("noise"); // noisy weapon speech - txt_file_names.push_back("insult"); // imp/demon taunts + txt_file_names.push_back("monspeak"); // monster speech + txt_file_names.push_back("wpnnoise"); // noisy weapon speech + txt_file_names.push_back("insult"); // imp/demon taunts for (int i = 0, size = txt_file_names.size(); i < size; i++) { |