diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-12 09:50:26 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-12 09:50:26 +0000 |
commit | 336db3e336c38c44f8ff0b6b8bf81c14e6d9a8d8 (patch) | |
tree | 6a38b0d0a1ca252ea3f6cab332a85aa9283f8564 | |
parent | 605ad1a626360b651b73805372bf74453a6f2410 (diff) | |
download | crawl-ref-336db3e336c38c44f8ff0b6b8bf81c14e6d9a8d8.tar.gz crawl-ref-336db3e336c38c44f8ff0b6b8bf81c14e6d9a8d8.zip |
Tweaked startup initialisation so that Crawl can load maps before curses
initialisation, but after item initialisation.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@617 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/acr.cc | 32 | ||||
-rw-r--r-- | crawl-ref/source/util/levcomp.ypp | 1 |
2 files changed, 16 insertions, 17 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index a212571bab..d5225c6ebe 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -213,13 +213,6 @@ int main( int argc, char *argv[] ) exit(0); } - init_io(); - -#ifdef USE_MACROS - // Load macros - macro_init(); -#endif - bool game_start = initialise(); if (game_start || Options.always_greet) @@ -2654,13 +2647,6 @@ static bool initialise(void) you.symbol = '@'; you.colour = LIGHTGREY; - // system initialisation stuff: - textbackground(0); - -#ifdef DOS - directvideo = 1; -#endif - seed_rng(); clear_ids(); // in itemname.cc init_char_table(Options.char_set); @@ -2670,8 +2656,6 @@ static bool initialise(void) init_monsters(mcolour); // this needs to be way up top {dlb} init_playerspells(); // this needs to be way up top {dlb} - clrscr(); - // init item array: for (i = 0; i < MAX_ITEMS; i++) init_item( i ); @@ -2723,6 +2707,22 @@ static bool initialise(void) // Read special levels and vaults. read_maps(); + + init_io(); + +#ifdef USE_MACROS + // Load macros + macro_init(); +#endif + + // system initialisation stuff: + textbackground(0); + +#ifdef DOS + directvideo = 1; +#endif + + clrscr(); // sets up a new game: bool newc = new_game(); diff --git a/crawl-ref/source/util/levcomp.ypp b/crawl-ref/source/util/levcomp.ypp index 77d5981810..6a16128b94 100644 --- a/crawl-ref/source/util/levcomp.ypp +++ b/crawl-ref/source/util/levcomp.ypp @@ -11,7 +11,6 @@ extern int yylineno; void yyerror(const char *e) { - io_cleanup(); fprintf(stderr, "%s:%d: %s\n", lc_desfile.c_str(), yylineno, e); // Bail bail bail. exit(1); |