petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r7098) -Regression (r7094): Zoom buttons were not properly updated with a new/loaded game. The

Browse Source 
good thing is, we got rid of even more magic code (tm)
This commit is contained in:
Darkvater
2006-11-07 14:41:53 +00:00
parent 745a5b8cc3
commit c4e4fa98fd
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
genworld.c
View File

@@ -249,19 +249,23 @@ void GenerateWorld(int mode, uint size_x, uint size_y)
/* Create toolbars */
SetupColorsAndInitialWindow();
if (_network_dedicated || (_gw.thread = OTTDCreateThread(&_GenerateWorld, (void *)"")) == NULL) {
/* Load the right landscape stuff */
GfxLoadSprites();
if (_network_dedicated ||
(_gw.thread = OTTDCreateThread(&_GenerateWorld, NULL)) == NULL) {
DEBUG(misc, 1) ("[Sl] Cannot create savegame thread, reverting to single-threaded mode...");
_gw.threaded = false;
_GenerateWorld(NULL);
} else {
/* Remove any open window */
DeleteAllNonVitalWindows();
/* Don't show the dialog if we don't have a thread */
ShowGenerateWorldProgress();
return;
}
/* Remove any open window */
DeleteAllNonVitalWindows();
/* Hide vital windows, because we don't allow to use them */
if (_gw.thread != NULL) HideVitalWindows();
HideVitalWindows();
/* Don't show the dialog if we don't have a thread */
ShowGenerateWorldProgress();
/* Centre the view on the map */
if (FindWindowById(WC_MAIN_WINDOW, 0) != NULL) {