diff options
author | Steven Noonan <steven@uplinklabs.net> | 2009-10-19 13:46:01 -0700 |
---|---|---|
committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-19 14:32:50 -0700 |
commit | 2bbc6dd25a227a747ef6bc7f83637b57c10d9af7 (patch) | |
tree | 696a88089bf48709bece93c8b96ac7550bf090d8 /crawl-ref/source/newgame.cc | |
parent | cf2b911c89d554a8f5f72156cef48b5f0fefd797 (diff) | |
download | crawl-ref-2bbc6dd25a227a747ef6bc7f83637b57c10d9af7.tar.gz crawl-ref-2bbc6dd25a227a747ef6bc7f83637b57c10d9af7.zip |
win32: eliminate need for WIN32TILES/WIN32CONSOLE macros
Instead of
defined(WIN32CONSOLE)
we should use:
defined(TARGET_OS_WINDOWS) && !defined(USE_TILE)
As well as replace
defined(WIN32TILES)
with:
defined(TARGET_OS_WINDOWS) && defined(USE_TILE)
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/newgame.cc')
-rw-r--r-- | crawl-ref/source/newgame.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index c9cb283619..56dadf1be4 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -3320,7 +3320,7 @@ static bool _validate_player_name(bool verbose) bool validate_player_name(const char* name, bool verbose) { -#if defined(TARGET_OS_DOS) || defined(WIN32CONSOLE) || defined(WIN32TILES) +#if defined(TARGET_OS_DOS) || defined(TARGET_OS_WINDOWS) // Quick check for CON -- blows up real good under DOS/Windows. if (stricmp(name, "con") == 0 || stricmp(name, "nul") == 0 |