mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r22789) -Codechange: rename generation window class to modal progress

release/1.2
rubidium 2011-08-21 12:49:14 +00:00
parent 421053a694
commit e99aec39ef
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/genworld.cpp
View File

@ -83,7 +83,7 @@ static void CleanupGeneration()
_gw.abortp = NULL; _gw.abortp = NULL;
_gw.threaded = false; _gw.threaded = false;
DeleteWindowById(WC_GENERATE_PROGRESS_WINDOW, 0); DeleteWindowById(WC_MODAL_PROGRESS, 0);
MarkWholeScreenDirty(); MarkWholeScreenDirty();
} }

6
src/genworld_gui.cpp
View File

@ -1216,7 +1216,7 @@ static const NWidgetPart _nested_generate_progress_widgets[] = {
static const WindowDesc _generate_progress_desc( static const WindowDesc _generate_progress_desc(
WDP_CENTER, 0, 0, WDP_CENTER, 0, 0,
WC_GENERATE_PROGRESS_WINDOW, WC_NONE, WC_MODAL_PROGRESS, WC_NONE,
WDF_UNCLICK_BUTTONS, WDF_UNCLICK_BUTTONS,
_nested_generate_progress_widgets, lengthof(_nested_generate_progress_widgets) _nested_generate_progress_widgets, lengthof(_nested_generate_progress_widgets)
); );
@ -1339,7 +1339,7 @@ void PrepareGenerateWorldProgress()
*/ */
void ShowGenerateWorldProgress() void ShowGenerateWorldProgress()
{ {
if (BringWindowToFrontById(WC_GENERATE_PROGRESS_WINDOW, 0)) return; if (BringWindowToFrontById(WC_MODAL_PROGRESS, 0)) return;
new GenerateProgressWindow(); new GenerateProgressWindow();
} }
@ -1390,7 +1390,7 @@ static void _SetGeneratingWorldProgress(GenWorldProgress cls, uint progress, uin
return; return;
} }
SetWindowDirty(WC_GENERATE_PROGRESS_WINDOW, 0); SetWindowDirty(WC_MODAL_PROGRESS, 0);
MarkWholeScreenDirty(); MarkWholeScreenDirty();
/* Release the rights to the map generator, and acquire the rights to the /* Release the rights to the map generator, and acquire the rights to the

2
src/window_type.h
View File

@ -93,7 +93,7 @@ enum WindowClass {
WC_ENDSCREEN, WC_ENDSCREEN,
WC_SIGN_LIST, WC_SIGN_LIST,
WC_GENERATE_LANDSCAPE, WC_GENERATE_LANDSCAPE,
WC_GENERATE_PROGRESS_WINDOW, WC_MODAL_PROGRESS,
WC_CONFIRM_POPUP_QUERY, WC_CONFIRM_POPUP_QUERY,
WC_TRANSPARENCY_TOOLBAR, WC_TRANSPARENCY_TOOLBAR,
WC_VEHICLE_TIMETABLE, WC_VEHICLE_TIMETABLE,