Apply patch #1039 to fix bug #11078.

changelog

@@ -76,6 +76,7 @@ Version 1.5.0-svn:
    * Preprocessor now logs when it encounters an undefined macro, and when it
      fails opening a file.
  * miscellaneous and bug fixes:
+   * Fixed error message for broken add-on campaigns (bug #11078)
    * Refactored the in-game console and added help function (patch #1036)
    * Added new commandline options (patch #1031)
      -s or --server [host] connect to host specified or to the first server

data/core/about.cfg

@@ -631,6 +631,9 @@
     [entry]
         name = "Andrea Palmatè (afxgroup)"
     [/entry]
+    [entry]
+        name = "Andrius Štikonas"
+    [/entry]
     [entry]
         name = "Ben Anderman (crimson_penguin)"
         comment = "unit list"
@@ -1497,7 +1500,7 @@
 [about]
     title = _"Lithuanian Translation"
     [entry]
-        name = "Andrius Štikonas (Mithrandir)"
+        name = "Andrius Štikonas"
     [/entry]
 [/about]
 

src/game.cpp

@@ -1808,7 +1808,7 @@ void game_controller::read_game_cfg(bool use_cache)
 
 				try {
 					preproc_map user_defines_map(defines_map);
-					scoped_istream stream = preprocess_file(toplevel,&user_defines_map,&user_error_log);
+					scoped_istream stream = preprocess_file(toplevel, &user_defines_map);
 
 					std::string campaign_error_log;
 
@@ -1826,7 +1826,7 @@ void game_controller::read_game_cfg(bool use_cache)
 					error_campaigns.push_back(*uc);
 
 					user_error_log += err.message + "\n";
-                } catch(preproc_config::error&) {
+				} catch(preproc_config::error&) {
 					ERR_CONFIG << "error reading usermade add-on '" << *uc << "'\n";
 					error_campaigns.push_back(*uc);
                     //no need to modify the error log here, already done by the preprocessor