diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-15 19:08:27 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-15 19:08:27 +0000 |
commit | d43e71a2423bb56d0ffe71d14093414e57e89ecb (patch) | |
tree | fc72b74a2bc13f73c6e3f83087ad778b26c884d8 /crawl-ref/source/acr.cc | |
parent | 5932620bfc39a9386d253378c4550cd4aca344b6 (diff) | |
download | crawl-ref-d43e71a2423bb56d0ffe71d14093414e57e89ecb.tar.gz crawl-ref-d43e71a2423bb56d0ffe71d14093414e57e89ecb.zip |
Plug a couple of memory holes. Unfortunately, between libSDL and
libfreetype there's loads of leakage that I can't do anything about.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9983 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
-rw-r--r-- | crawl-ref/source/acr.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 2c3d41930d..18798dee26 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -286,6 +286,8 @@ int main( int argc, char *argv[] ) while (true) _input(); + clear_globals_on_exit(); + return 0; } @@ -1005,12 +1007,13 @@ static void _input() c_input_reset(true); _center_cursor(); - // Enable the cursor to read input. The cursor stays on while - // the command is being processed, so subsidiary prompts - // shouldn't need to turn it on explicitly. + #ifdef USE_TILE cursor_control con(false); #else + // Enable the cursor to read input. The cursor stays on while + // the command is being processed, so subsidiary prompts + // shouldn't need to turn it on explicitly. cursor_control con(true); #endif const command_type cmd = _get_next_cmd(); @@ -2561,8 +2564,11 @@ void world_reacts() } #ifdef USE_TILE - tiles.clear_text_tags(TAG_TUTORIAL); - tiles.place_cursor(CURSOR_TUTORIAL, Region::NO_CURSOR); + if (Options.tutorial_left) + { + tiles.clear_text_tags(TAG_TUTORIAL); + tiles.place_cursor(CURSOR_TUTORIAL, Region::NO_CURSOR); + } #endif if (you.num_turns != -1) |