summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authorJohanna Ploog <j-p-e-g@users.sourceforge.net>2009-12-17 01:53:40 +0100
committerJohanna Ploog <j-p-e-g@users.sourceforge.net>2009-12-17 01:53:40 +0100
commit761b088e911386a2860ba50a8a3271739264283c (patch)
tree786e7281b665bebddc164cdb622e4fc286670d90 /crawl-ref/source
parent013eca8ddb8c251e93b8bbd55649c808518c0464 (diff)
downloadcrawl-ref-761b088e911386a2860ba50a8a3271739264283c.tar.gz
crawl-ref-761b088e911386a2860ba50a8a3271739264283c.zip
Add a tile for Maurice. :)
Might be a bit too hard to see on some textures, though I tested it in all branches.
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/rltiles/dc-mon.txt1
-rw-r--r--crawl-ref/source/rltiles/dc-mon/unique/maurice.pngbin0 -> 902 bytes
-rw-r--r--crawl-ref/source/tilemcache.cc4
-rw-r--r--crawl-ref/source/tilepick.cc2
4 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 4afbdba3c8..a0c777ed1a 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -309,6 +309,7 @@ kirke MONS_KIRKE
louise MONS_LOUISE
margery MONS_MARGERY
maud MONS_MAUD
+maurice MONS_MAURICE
norbert MONS_NORBERT
norris MONS_NORRIS
psyche MONS_PSYCHE
diff --git a/crawl-ref/source/rltiles/dc-mon/unique/maurice.png b/crawl-ref/source/rltiles/dc-mon/unique/maurice.png
new file mode 100644
index 0000000000..284ad4645c
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/unique/maurice.png
Binary files differ
diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc
index aab46530fd..2a6ff9f6f8 100644
--- a/crawl-ref/source/tilemcache.cc
+++ b/crawl-ref/source/tilemcache.cc
@@ -443,6 +443,10 @@ bool mcache_monster::get_weapon_offset(int mon_tile, int &ofs_x, int &ofs_y)
ofs_x = -1;
ofs_y = -3;
break;
+ case TILEP_MONS_MAURICE:
+ ofs_x = -2;
+ ofs_y = -2;
+ break;
case TILEP_MONS_SONJA:
ofs_x = -2;
ofs_y = -7;
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index af9293e656..258ce242ba 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -1081,7 +1081,7 @@ int tileidx_monster_base(const monsters *mon, bool detected)
case MONS_NIKOLA:
return TILEP_TODO; // TODO
case MONS_MAURICE:
- return TILEP_TODO; // TODO
+ return TILEP_MONS_MAURICE;
// unique major demons ('&')
case MONS_MNOLEG: