Merge trunk back into 0.2 for 0.2.2.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1227 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index d293ea9066..d083f087c8 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -2873,9 +2873,6 @@ static bool initialise(void)
     
     cio_init();
 
-    // Load macros
-    macro_init();
-
     // system initialisation stuff:
     textbackground(0);
 
@@ -2891,6 +2888,9 @@ static bool initialise(void)
 
     if (!newc)
         restore_game();
+    
+    // Load macros
+    macro_init();
 
     game_has_started = true;