diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-11 13:11:54 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-11 13:11:54 +0000 |
| commit | a6e4d3b9c8c04d5fabeca21c6a5b7d98c77c452f (patch) | |
| tree | 2bd3d32149bf7b25d9f32d9a6adb1ea6307badaf /crawl-ref/source/stash.cc | |
| parent | 3861479ddd6f0af75d97ba21794a831cfedf156c (diff) | |
| download | crawl-ref-a6e4d3b9c8c04d5fabeca21c6a5b7d98c77c452f.tar.gz crawl-ref-a6e4d3b9c8c04d5fabeca21c6a5b7d98c77c452f.zip | |
Fixed $ not correctly setting the deepest depth in branches from the ^G depth
prompt under certain circumstances (Erik).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1837 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/stash.cc')
| -rw-r--r-- | crawl-ref/source/stash.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc index 8068af9c6f..0889f3006b 100644 --- a/crawl-ref/source/stash.cc +++ b/crawl-ref/source/stash.cc @@ -53,7 +53,7 @@ std::string userdef_annotate_item(const char *s, const item_def *item, if (exclusive) lua_set_exclusive_item(item); std::string ann; - if (!clua.callfn(s, "u>s", item, &ann)) + if (!clua.callfn(s, "u>s", item, &ann) && !clua.error.empty()) mprf(MSGCH_WARN, "Lua error: %s", clua.error.c_str()); if (exclusive) lua_set_exclusive_item(NULL); |