diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2011-10-25 15:38:46 -0500 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2011-10-25 15:38:46 -0500 |
| commit | ce5cd1e9df7f220ee7d07b285b76473ec9fb928f (patch) | |
| tree | 9f56ef300bc15746c2cde58dcbd09c2df1bdac95 /crawl-ref/source/tilereg-mon.cc | |
| parent | 71b738e8b44d6dad14c29bc898eff2ac700e9e1e (diff) | |
| parent | 5efc2ebb172e0046e26e8b4a5114359f2e217628 (diff) | |
| download | crawl-ref-ce5cd1e9df7f220ee7d07b285b76473ec9fb928f.tar.gz crawl-ref-ce5cd1e9df7f220ee7d07b285b76473ec9fb928f.zip | |
Merge branch 'master' into unified_combat_control
Conflicts:
crawl-ref/source/Makefile.obj
crawl-ref/source/dbg-scan.cc
crawl-ref/source/decks.cc
crawl-ref/source/describe.cc
crawl-ref/source/directn.cc
crawl-ref/source/evoke.cc
crawl-ref/source/fight.cc
crawl-ref/source/fight.h
crawl-ref/source/ghost.cc
crawl-ref/source/ghost.h
crawl-ref/source/item_use.cc
crawl-ref/source/items.cc
crawl-ref/source/map_knowledge.cc
crawl-ref/source/melee_attack.h
crawl-ref/source/mon-abil.cc
crawl-ref/source/mon-act.cc
crawl-ref/source/mon-stuff.cc
crawl-ref/source/monster.cc
crawl-ref/source/monster.h
crawl-ref/source/player.cc
crawl-ref/source/player.h
crawl-ref/source/shopping.cc
crawl-ref/source/spl-damage.cc
crawl-ref/source/spl-summoning.cc
crawl-ref/source/spl-transloc.cc
crawl-ref/source/stairs.cc
crawl-ref/source/stuff.cc
crawl-ref/source/tags.cc
crawl-ref/source/traps.cc
crawl-ref/source/xom.cc
Diffstat (limited to 'crawl-ref/source/tilereg-mon.cc')
| -rw-r--r-- | crawl-ref/source/tilereg-mon.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/tilereg-mon.cc b/crawl-ref/source/tilereg-mon.cc index 34cd59afff..b9b05cd2cd 100644 --- a/crawl-ref/source/tilereg-mon.cc +++ b/crawl-ref/source/tilereg-mon.cc @@ -1,6 +1,6 @@ #include "AppHdr.h" -#ifdef USE_TILE +#ifdef USE_TILE_LOCAL #include <algorithm> #include "tilereg-mon.h" |