summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-09-11 15:12:33 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-09-11 15:12:33 +0000
commit7c230030738f1d67c341aa2c24afcb231f14c3be (patch)
tree8a3b385118e8d0e0ae0ab21a34a6b3dc0c874102 /crawl-ref/source
parent2ffa0bd35ffd8e9095c12b06e3cd5c15ec07b967 (diff)
downloadcrawl-ref-7c230030738f1d67c341aa2c24afcb231f14c3be.tar.gz
crawl-ref-7c230030738f1d67c341aa2c24afcb231f14c3be.zip
Fix 1792307 and 1790913, both small stuff.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2073 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/dat/shout.txt10
-rw-r--r--crawl-ref/source/newgame.cc13
2 files changed, 18 insertions, 5 deletions
diff --git a/crawl-ref/source/dat/shout.txt b/crawl-ref/source/dat/shout.txt
index 1cbe8b97bf..28dceff0e7 100644
--- a/crawl-ref/source/dat/shout.txt
+++ b/crawl-ref/source/dat/shout.txt
@@ -50,7 +50,15 @@ __CROAK
You hear a loud, deep croak!
-Your hear a croak.
+You hear a croak.
+%%%%
+__GROWL
+
+You hear an angry growl.
+%%%%
+__HISS
+
+You hear an angry hiss.
%%%%
__DEMON_TAUNT
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index cc354a647b..d1220efff1 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -2356,12 +2356,20 @@ static void give_random_scroll( int slot )
static void give_random_potion( int slot )
{
+ // Mummies can't quaff and don't care
+ if (you.species == SP_MUMMY)
+ return;
+
you.inv[ slot ].quantity = 1;
you.inv[ slot ].base_type = OBJ_POTIONS;
you.inv[ slot ].plus = 0;
you.inv[ slot ].plus2 = 0;
- switch (random2(8))
+ int temp_rand = 8;
+ if (you.is_undead)
+ temp_rand--;
+
+ switch (random2(temp_rand))
{
case 0:
case 1:
@@ -2877,9 +2885,6 @@ static void create_wanderer( void )
you.equip[EQ_WEAPON] = 0;
you.equip[EQ_BODY_ARMOUR] = 2;
-
- if (you.species == SP_MUMMY)
- you.inv[3].quantity = 0; // remove potion
}
static job_type letter_to_class(int keyn)