diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-03-05 21:35:33 -0700 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-03-05 21:35:33 -0700 |
| commit | 4c31b69bc54db47ae8807358df3a296374dd55de (patch) | |
| tree | 74c688ccdc6b328d564ffbbdcc816a418bf6bad8 /crawl-ref/source/tilemcache.cc | |
| parent | 5c32a58d9d660d93005c9697e91864a21ba6b882 (diff) | |
| download | crawl-ref-4c31b69bc54db47ae8807358df3a296374dd55de.tar.gz crawl-ref-4c31b69bc54db47ae8807358df3a296374dd55de.zip | |
Allow vault monster tiles to overwrite constructed monster tiles.
Motivated by the tiles that were supposed to be - and are - now used in
the wizlab_wucad rewrite.
Diffstat (limited to 'crawl-ref/source/tilemcache.cc')
| -rw-r--r-- | crawl-ref/source/tilemcache.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc index aff351c731..84cb7ed648 100644 --- a/crawl-ref/source/tilemcache.cc +++ b/crawl-ref/source/tilemcache.cc @@ -139,7 +139,14 @@ unsigned int mcache_manager::register_monster(const monster_info& minf) mcache_entry *entry; - if (mcache_demon::valid(minf)) + if (minf.props.exists("monster_tile")) + { + if (mcache_monster::valid(minf)) + entry = new mcache_monster(minf); + else + return 0; + } + else if (mcache_demon::valid(minf)) entry = new mcache_demon(minf); else if (mcache_ghost::valid(minf)) entry = new mcache_ghost(minf); |