diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-10 09:48:48 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-10 09:48:48 +0000 |
| commit | a821a5c34708aff459b31f4d16d2c33ec0ca0ecd (patch) | |
| tree | fc3a31b7f182b9a2941eb5bd8f342b065fcda090 /crawl-ref/source/initfile.cc | |
| parent | 2ae0f20477620dc731f9d9fc40cc1d8a38069b55 (diff) | |
| download | crawl-ref-a821a5c34708aff459b31f4d16d2c33ec0ca0ecd.tar.gz crawl-ref-a821a5c34708aff459b31f4d16d2c33ec0ca0ecd.zip | |
A few general fixes:
Fix 1791185: Memory overrun. Patch provided by ennewalker.
Fix 1789803. Again, patch by ennewalker.
Fix 1790486: Throwing nets and launchers.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2063 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
| -rw-r--r-- | crawl-ref/source/initfile.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 58fddaba65..bed5a7e9ea 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -263,6 +263,8 @@ static fire_type str_to_fire_types( const std::string &str ) return (FIRE_CLUB); else if (str == "javelin") return (FIRE_JAVELIN); + else if (str == "net") + return (FIRE_NET); return (FIRE_NONE); } |