diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-17 20:52:54 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-17 20:52:54 +0000 |
| commit | 4b806f77ff9f7da60fd0faf201b8ab83f76ce457 (patch) | |
| tree | c0ea487b56eb55ac5f4bb3929f85ec1e5a961213 /crawl-ref/source/externs.h | |
| parent | 4280b1792236d066241fd6c6f36e4900f032180a (diff) | |
| download | crawl-ref-4b806f77ff9f7da60fd0faf201b8ab83f76ce457.tar.gz crawl-ref-4b806f77ff9f7da60fd0faf201b8ab83f76ce457.zip | |
A number of small bug fixes:
* 2811005: unknown mimics being stabbable
* 2818709: restrict monsters picking up stuff to 2 items per turn
* 2820097: reintroduce prompts for firing _in the direction_ of allies
and fix message
* 2821462: returning from tutorial screen swallowing a keypress
* 2822771: fire elementals could be placed in shallow water
Also, Azrael is no longer generated in the Shoals/Swamp
Also, implement the second part of FR 2820876: Xom will no longer
confuse the player if there's adjacent deep water or lava. This
restriction doesn't apply if Xom is feeling nasty (penance or bored)
and there's also no checks for water/lava further away.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10255 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/externs.h')
| -rw-r--r-- | crawl-ref/source/externs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index c2a0ec73be..3b5157309d 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -118,6 +118,11 @@ struct coord_def return (x < other.x) || (x == other.x && y < other.y); } + bool operator > (const coord_def &other) const + { + return (x > other.x) || (x == other.x && y > other.y); + } + const coord_def &operator += (const coord_def &other) { x += other.x; |