(svn r23611) -Add: run the begin of the script already while generating, and don't sleep on DoCommand while doing so

1 files changed, 12 insertions, 0 deletions

diff --git a/src/genworld.cpp b/src/genworld.cpp
index f36837879..ca4f1ef6f 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -34,6 +34,7 @@
 #include "progress.h"
 #include "error.h"
 #include "game/game.hpp"
+#include "game/game_instance.hpp"
 
 #include "table/sprites.h"
 
@@ -166,6 +167,17 @@ static void _GenerateWorld(void *)
 
 			if (_game_mode != GM_EDITOR) {
 				Game::StartNew();
+
+				if (Game::GetInstance() != NULL) {
+					SetGeneratingWorldProgress(GWP_RUNSCRIPT, 2500);
+					_generating_world = true;
+					for (i = 0; i < 2500; i++) {
+						Game::GameLoop();
+						IncreaseGeneratingWorldProgress(GWP_RUNSCRIPT);
+						if (Game::GetInstance()->IsSleeping()) break;
+					}
+					_generating_world = false;
+				}
 			}
 		}