From 2bbc6dd25a227a747ef6bc7f83637b57c10d9af7 Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Mon, 19 Oct 2009 13:46:01 -0700 Subject: 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 --- crawl-ref/source/beam.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index d2cb9b3db8..28f181a08b 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2081,7 +2081,7 @@ void bolt::do_fire() choose_ray(); } -#ifdef WIN32CONSOLE +#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE) // Before we start drawing the beam, turn buffering off. bool oldValue = true; if (!is_tracer) @@ -2193,7 +2193,7 @@ void bolt::do_fire() } // That's it! -#ifdef WIN32CONSOLE +#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE) set_buffering(oldValue); #endif } @@ -5518,7 +5518,7 @@ bool bolt::explode(bool show_more, bool hole_in_the_middle) exp_map.init(INT_MAX); determine_affected_cells(exp_map, coord_def(), 0, r, true, true); -#ifdef WIN32CONSOLE +#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE) // turn buffering off bool oldValue = true; if (!is_tracer) @@ -5583,7 +5583,7 @@ bool bolt::explode(bool show_more, bool hole_in_the_middle) } } -#ifdef WIN32CONSOLE +#if defined(TARGET_OS_WINDOWS) && !defined(USE_TILE) if (!is_tracer) set_buffering(oldValue); #endif -- cgit v1.2.3-54-g00ecf