equal
deleted
inserted
replaced
54 #include "../macros.h" |
54 #include "../macros.h" |
55 #include "../sdl.h" |
55 #include "../sdl.h" |
56 #include "../window.h" |
56 #include "../window.h" |
57 #include "../network.h" |
57 #include "../network.h" |
58 #include "../variables.h" |
58 #include "../variables.h" |
|
59 #include "../genworld.h" |
59 #include "../os/macosx/splash.h" |
60 #include "../os/macosx/splash.h" |
60 |
61 |
61 #include "cocoa_v.h" |
62 #include "cocoa_v.h" |
62 #include "cocoa_keys.h" |
63 #include "cocoa_keys.h" |
63 |
64 |
707 #else |
708 #else |
708 if (_cocoa_video_data.tab_is_down) |
709 if (_cocoa_video_data.tab_is_down) |
709 #endif |
710 #endif |
710 { |
711 { |
711 if (!_networking && _game_mode != GM_MENU) _fast_forward |= 2; |
712 if (!_networking && _game_mode != GM_MENU) _fast_forward |= 2; |
712 } else if (_fast_forward & 2) { |
713 } else if (_fast_forward & 2 && !IsGeneratingWorld()) { |
713 _fast_forward = 0; |
714 _fast_forward = 0; |
714 } |
715 } |
715 |
716 |
716 cur_ticks = GetTick(); |
717 cur_ticks = GetTick(); |
717 if ((_fast_forward && !_pause) || cur_ticks > next_tick) |
718 if ((_fast_forward && !_pause) || cur_ticks > next_tick) |