diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-19 23:13:26 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-19 23:13:26 +0000 |
commit | 9ba57ee3a6f72308ff01263dfe143cf23c1cf321 (patch) | |
tree | 968cb123684f700f4a612804f8670b0e8e049a93 /crawl-ref/source/mapdef.cc | |
parent | 003c3dc779fbd0ba44bc4fafadafb45db537fda7 (diff) | |
download | crawl-ref-9ba57ee3a6f72308ff01263dfe143cf23c1cf321.tar.gz crawl-ref-9ba57ee3a6f72308ff01263dfe143cf23c1cf321.zip |
Fixes to compile with Visual C++. Moved direct.cc and direct.h to directn.* to avoid conflict with VC++ direct.h header.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4390 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mapdef.cc')
-rw-r--r-- | crawl-ref/source/mapdef.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index 594ce07464..26fb4f78aa 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -15,7 +15,7 @@ #include "AppHdr.h" #include "branch.h" #include "describe.h" -#include "direct.h" +#include "directn.h" #include "dungeon.h" #include "files.h" #include "initfile.h" @@ -1426,6 +1426,7 @@ std::string map_def::validate_map_def() if (!err.empty()) return (err); + fixup(); resolve(); test_lua_validate(true); @@ -1719,8 +1720,7 @@ void map_def::rotate(bool clock) void map_def::normalise() { - // Minivaults are padded out with floor tiles, normal maps are - // padded out with rock walls. + // Pad out lines that are shorter than max. map.normalise(' '); } |