(svn r5946) -Add: merged the TGP branch to mainline. TGP adds:

  - New optional landscape generator (TerraGenesis Perlin)
  - Load heightmaps (either BMP or PNG)
  - Progress dialog while generating worlds (no longer a 'hanging' screen)
  - New dialogs for NewGame, Create Scenario and Play Heightmap
    - Easier to configure your landscape
    - More things to configure (tree-placer, ..)
  - Speedup of world generation
  - New console command 'restart': restart the map EXACTLY as it was when you
      first started it (needs a game made after or with this commit)
  - New console command 'getseed': get the seed of your map and share it with
      others (of course only works with generated maps)
  - Many new, world generation related, things
  - Many internal cleanups and rewrites
  Many tnx to those people who helped making this:
     Belugas, DaleStan, glx, KUDr, RichK67, Rubidium, and TrueLight (alfabetic)
  Many tnx to those who helped testing:
     Arnau, Bjarni, and tokai (alfabetic)
  And to all other people who helped testing and sending comments / bugs
  Stats: 673 lines changed, 3534 new lines, 79 new strings

1 files changed, 2 insertions, 1 deletions

diff --git a/video/cocoa_v.m b/video/cocoa_v.m
index 4de6af703..758120f03 100644
--- a/video/cocoa_v.m
+++ b/video/cocoa_v.m
@@ -56,6 +56,7 @@ extern void HideMenuBar(void);
 #include "../window.h"
 #include "../network.h"
 #include "../variables.h"
+#include "../genworld.h"
 #include "../os/macosx/splash.h"
 
 #include "cocoa_v.h"
@@ -709,7 +710,7 @@ static void QZ_GameLoop(void)
 #endif
 		{
 			if (!_networking && _game_mode != GM_MENU) _fast_forward |= 2;
-		} else if (_fast_forward & 2) {
+		} else if (_fast_forward & 2 && !IsGeneratingWorld()) {
 			_fast_forward = 0;
 		}