diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-02 04:36:18 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-02 04:36:18 +0000 |
| commit | fa6393b63b270a07e02ce4c8333b23013b5ded75 (patch) | |
| tree | 043489a6bc83f6fa827ccb34bd574a4aa18ba7ee /crawl-ref/source/dat/clua | |
| parent | 20c98d67894a6fe8c8fac01e841108b5878160db (diff) | |
| download | crawl-ref-fa6393b63b270a07e02ce4c8333b23013b5ded75.tar.gz crawl-ref-fa6393b63b270a07e02ce4c8333b23013b5ded75.zip | |
Fix broken sewer messaging (dpeg).
Fixed bad bounds checks for minivaults placed by dgn_place_map.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7716 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dat/clua')
| -rw-r--r-- | crawl-ref/source/dat/clua/lm_tmsg.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/dat/clua/lm_tmsg.lua b/crawl-ref/source/dat/clua/lm_tmsg.lua index 42e0246cfa..7ffecddc21 100644 --- a/crawl-ref/source/dat/clua/lm_tmsg.lua +++ b/crawl-ref/source/dat/clua/lm_tmsg.lua @@ -34,7 +34,7 @@ function TimedMessaging:channel() end function TimedMessaging:init(tmarker, cm, verbose) - self.entity = tmarker.props.entity or tmarker.props.desc + self.entity = self.entity or tmarker.props.entity or tmarker.props.desc if not self.ranges and not self.visible and not self.messages then self.ranges = { @@ -141,7 +141,8 @@ function TimedMessaging:say_message(cm, dur) return end - local noisemaker = self:range_adjective(cm, self.noisemaker) + local noisemaker = + self.noisemaker and self:range_adjective(cm, self.noisemaker) self:proc_ranges(self.ranges, dur, function (chk) |