From 987edc97f76551193f002446ee0f21ccf19be8fa Mon Sep 17 00:00:00 2001 From: dshaligram Date: Sun, 2 Dec 2007 14:56:28 +0000 Subject: Trunk->0.3 merge (2977-2978): Fixed DOS colour weirdness, updated changes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2979 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/docs/changes.stone_soup | 1 + crawl-ref/source/files.cc | 1 - crawl-ref/source/view.cc | 4 ++++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup index bdd21b07b6..6b7303ace5 100644 --- a/crawl-ref/docs/changes.stone_soup +++ b/crawl-ref/docs/changes.stone_soup @@ -9,6 +9,7 @@ Stone Soup 0.3.3 (20071202) * Fixed nets not trapping monsters correctly. * Fixed monsters being able to get past plants on level load. * Fixed out-of-sight monsters raising dead in the player's line-of-sight. +* Fixed brand colours flooding screen in DOS. * Returning weapons auto-id on use by monsters. * Autobutcher respects !w inscriptions. * Horns mutation changes helmet slot description to "restricted". diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index 85141bc82c..01fc721e18 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -320,7 +320,6 @@ static int create_directory(const char *dir) #if defined(MULTIUSER) return mkdir(dir, SHARED_FILES_CHMOD_PUBLIC | 0111); #elif defined(DOS) - // djgpp doesn't seem to have mkdir. return mkdir(dir, 0755); #else return mkdir(dir); diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index eae73efd67..41125312d8 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -4051,6 +4051,10 @@ void view_update_at(const coord_def &pos) gotoxy(vp.x, vp.y); textattr(flash_colour? real_colour(flash_colour) : colour); putwch(ch); + + // Force colour back to normal, else clrscr() will flood screen + // with this colour on DOS. + textattr(LIGHTGREY); } bool view_update() -- cgit v1.2.3-54-g00ecf