equal
deleted
inserted
replaced
140 if (_gw.proc != NULL) _gw.proc(); |
140 if (_gw.proc != NULL) _gw.proc(); |
141 IncreaseGeneratingWorldProgress(GWP_GAME_START); |
141 IncreaseGeneratingWorldProgress(GWP_GAME_START); |
142 |
142 |
143 if (_cursor.sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE, PAL_NONE); |
143 if (_cursor.sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE, PAL_NONE); |
144 /* Show all vital windows again, because we have hidden them */ |
144 /* Show all vital windows again, because we have hidden them */ |
145 if (_gw.threaded && _game_mode != GM_MENU) ShowVitalWindows(); |
145 if (_gw.threaded && _game_mode != GM_MENU) Window::ShowVitalWindows(); |
146 _gw.active = false; |
146 _gw.active = false; |
147 _gw.thread = NULL; |
147 _gw.thread = NULL; |
148 _gw.proc = NULL; |
148 _gw.proc = NULL; |
149 _gw.threaded = false; |
149 _gw.threaded = false; |
150 |
150 |
213 |
213 |
214 if (_gw.abortp != NULL) _gw.abortp(); |
214 if (_gw.abortp != NULL) _gw.abortp(); |
215 |
215 |
216 if (_cursor.sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE, PAL_NONE); |
216 if (_cursor.sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE, PAL_NONE); |
217 /* Show all vital windows again, because we have hidden them */ |
217 /* Show all vital windows again, because we have hidden them */ |
218 if (_gw.threaded && _game_mode != GM_MENU) ShowVitalWindows(); |
218 if (_gw.threaded && _game_mode != GM_MENU) Window::ShowVitalWindows(); |
219 _gw.active = false; |
219 _gw.active = false; |
220 _gw.thread = NULL; |
220 _gw.thread = NULL; |
221 _gw.proc = NULL; |
221 _gw.proc = NULL; |
222 _gw.abortp = NULL; |
222 _gw.abortp = NULL; |
223 _gw.threaded = false; |
223 _gw.threaded = false; |
276 _GenerateWorld(NULL); |
276 _GenerateWorld(NULL); |
277 return; |
277 return; |
278 } |
278 } |
279 |
279 |
280 /* Remove any open window */ |
280 /* Remove any open window */ |
281 DeleteAllNonVitalWindows(); |
281 Window::DeleteAllNonVitalWindows(); |
282 /* Hide vital windows, because we don't allow to use them */ |
282 /* Hide vital windows, because we don't allow to use them */ |
283 HideVitalWindows(); |
283 Window::HideVitalWindows(); |
284 |
284 |
285 /* Don't show the dialog if we don't have a thread */ |
285 /* Don't show the dialog if we don't have a thread */ |
286 ShowGenerateWorldProgress(); |
286 ShowGenerateWorldProgress(); |
287 |
287 |
288 /* Centre the view on the map */ |
288 /* Centre the view on the map */ |