mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r22787) -Codechange: rename genworld redraw constant
This commit is contained in:
parent
7b7869fba7
commit
a67cf6bae1
|
@ -22,8 +22,8 @@ enum LandscapeGenerator {
|
||||||
LG_TERRAGENESIS = 1, ///< TerraGenesis Perlin landscape generator
|
LG_TERRAGENESIS = 1, ///< TerraGenesis Perlin landscape generator
|
||||||
};
|
};
|
||||||
|
|
||||||
static const uint GENERATE_NEW_SEED = UINT_MAX; ///< Create a new random seed
|
static const uint GENERATE_NEW_SEED = UINT_MAX; ///< Create a new random seed
|
||||||
static const uint GENWORLD_REDRAW_TIMEOUT = 200; ///< Timeout between redraws
|
static const uint MODAL_PROGRESS_REDRAW_TIMEOUT = 200; ///< Timeout between redraws
|
||||||
|
|
||||||
/** Modes for GenerateWorld */
|
/** Modes for GenerateWorld */
|
||||||
enum GenWorldMode {
|
enum GenWorldMode {
|
||||||
|
|
|
@ -1365,7 +1365,7 @@ static void _SetGeneratingWorldProgress(GenWorldProgress cls, uint progress, uin
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Don't update the screen too often. So update it once in every once in a while... */
|
/* Don't update the screen too often. So update it once in every once in a while... */
|
||||||
if (!_network_dedicated && _gws.timer != 0 && _realtime_tick - _gws.timer < GENWORLD_REDRAW_TIMEOUT) return;
|
if (!_network_dedicated && _gws.timer != 0 && _realtime_tick - _gws.timer < MODAL_PROGRESS_REDRAW_TIMEOUT) return;
|
||||||
|
|
||||||
/* Percentage is about the number of completed tasks, so 'current - 1' */
|
/* Percentage is about the number of completed tasks, so 'current - 1' */
|
||||||
_gws.percent = percent_table[cls] + (percent_table[cls + 1] - percent_table[cls]) * (_gws.current == 0 ? 0 : _gws.current - 1) / _gws.total;
|
_gws.percent = percent_table[cls] + (percent_table[cls + 1] - percent_table[cls]) * (_gws.current == 0 ? 0 : _gws.current - 1) / _gws.total;
|
||||||
|
|
|
@ -1561,8 +1561,8 @@ void DrawDirtyBlocks()
|
||||||
_modal_progress_work_mutex->EndCritical();
|
_modal_progress_work_mutex->EndCritical();
|
||||||
|
|
||||||
/* Wait a while and update _realtime_tick so we are given the rights */
|
/* Wait a while and update _realtime_tick so we are given the rights */
|
||||||
CSleep(GENWORLD_REDRAW_TIMEOUT);
|
CSleep(MODAL_PROGRESS_REDRAW_TIMEOUT);
|
||||||
_realtime_tick += GENWORLD_REDRAW_TIMEOUT;
|
_realtime_tick += MODAL_PROGRESS_REDRAW_TIMEOUT;
|
||||||
_modal_progress_paint_mutex->BeginCritical();
|
_modal_progress_paint_mutex->BeginCritical();
|
||||||
_modal_progress_work_mutex->BeginCritical();
|
_modal_progress_work_mutex->BeginCritical();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue