diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-08 11:10:52 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-08 11:10:52 +0000 |
commit | 9ac3b8f9fc0c7217e75ec38bdac887fb421fcf4f (patch) | |
tree | be16ae94e2913c076202a4812947ab41d847c74b | |
parent | e7240df9978d7ba42ed7dcfdf9ab385b2ce74d36 (diff) | |
download | crawl-ref-9ac3b8f9fc0c7217e75ec38bdac887fb421fcf4f.tar.gz crawl-ref-9ac3b8f9fc0c7217e75ec38bdac887fb421fcf4f.zip |
Fixed map colours being inherited by unrelated maps during compilation.
Pause after reporting an error for dgamelaunch so that the dgl menu does not hide the error message.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2371 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/AppHdr.h | 4 | ||||
-rw-r--r-- | crawl-ref/source/mapdef.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/stuff.cc | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index 308618888b..7c9fab97d6 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -253,6 +253,10 @@ // Uses Options.macro_dir as the full path to the macro file. Mutually // exclusive with DGL_NAMED_MACRO_FILE. #define DGL_MACRO_ABSOLUTE_PATH + + // Makes the game ask the user to hit Enter after bailing out with + // an error message. + #define DGL_PAUSE_AFTER_ERROR #endif #if defined(REGEX_POSIX) && defined(REGEX_PCRE) diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index c446f6d969..847859697d 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -1185,6 +1185,8 @@ void map_def::reinit() keyspecs.clear(); welcome_messages.clear(); + rock_colour = floor_colour = BLACK; + // Base chance; this is not a percentage. chance = 10; diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index 6c34edf547..50483f903c 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -430,7 +430,7 @@ void end(int exit_code, bool print_error, const char *format, ...) error.clear(); } -#if defined(WIN32CONSOLE) || defined(DOS) +#if defined(WIN32CONSOLE) || defined(DOS) || defined(DGL_PAUSE_AFTER_ERROR) if (exit_code) { fprintf(stderr, "Hit Enter to continue...\n"); |