diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-17 20:46:06 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-17 20:46:06 +0000 |
| commit | 3b86a06d39b6c59db6861f54f468b43513b60827 (patch) | |
| tree | d3b30910f9aa6500f20d2a7620966f06419df16c /crawl-ref | |
| parent | 4758caffda6ea00f6d4f83e58a2ae98d2d0f35a7 (diff) | |
| download | crawl-ref-3b86a06d39b6c59db6861f54f468b43513b60827.tar.gz crawl-ref-3b86a06d39b6c59db6861f54f468b43513b60827.zip | |
Apply minor fixes patch [2727286] by kotk, minus the sqldbm.h type
changes (as I have no way of testing them on multiple platforms).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9615 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/debug.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/tilemcache.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/debug.h b/crawl-ref/source/debug.h index b3cad9db19..d91965e254 100644 --- a/crawl-ref/source/debug.h +++ b/crawl-ref/source/debug.h @@ -121,7 +121,7 @@ void debug_stethoscope(int mon); #endif class monsters; -class coord_def; +struct coord_def; void wizard_apply_monster_blessing(monsters* mon); void wizard_give_monster_item(monsters* mon); diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc index 17943907cb..ec9066f877 100644 --- a/crawl-ref/source/tilemcache.cc +++ b/crawl-ref/source/tilemcache.cc @@ -125,7 +125,7 @@ protected: unsigned int tile_fg_store::operator=(unsigned int tile) { - if (tile & TILE_FLAG_MASK == m_tile & TILE_FLAG_MASK) + if ((tile & TILE_FLAG_MASK) == (m_tile & TILE_FLAG_MASK)) { // Update, as flags may have changed. m_tile = tile; |