summaryrefslogtreecommitdiff
path: root/src/genworld.h
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-08-21 12:48:46 +0000
committerrubidium <rubidium@openttd.org>2011-08-21 12:48:46 +0000
commit421053a694273c9ea56089316b944769157cfba2 (patch)
tree81862701ef878d6f16091ef6ffbec10cf6c09c57 /src/genworld.h
parenta67cf6bae1ffdea7d5451160c8cfa0df691eb963 (diff)
downloadopenttd-421053a694273c9ea56089316b944769157cfba2.tar.xz
(svn r22788) -Codechange: move modal progress related functions and variables to progress.cpp/h
Diffstat (limited to 'src/genworld.h')
-rw-r--r--src/genworld.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/genworld.h b/src/genworld.h
index ed57d103d..4814e7d8b 100644
--- a/src/genworld.h
+++ b/src/genworld.h
@@ -23,7 +23,6 @@ enum LandscapeGenerator {
};
static const uint GENERATE_NEW_SEED = UINT_MAX; ///< Create a new random seed
-static const uint MODAL_PROGRESS_REDRAW_TIMEOUT = 200; ///< Timeout between redraws
/** Modes for GenerateWorld */
enum GenWorldMode {
@@ -42,7 +41,6 @@ typedef void GWAbortProc(); ///< Called when genworld is aborted
/** Properties of current genworld process */
struct GenWorldInfo {
- bool active; ///< Is generating world active
bool abort; ///< Whether to abort the thread ASAP
bool quit_thread; ///< Do we want to quit the active thread
bool threaded; ///< Whether we run _GenerateWorld threaded
@@ -71,16 +69,6 @@ enum GenWorldProgress {
GWP_CLASS_COUNT
};
-/**
- * Check if we are currently in the process of generating a world.
- * @return are we generating world?
- */
-static inline bool HasModalProgress()
-{
- extern GenWorldInfo _gw;
- return _gw.active;
-}
-
/* genworld.cpp */
bool IsGenerateWorldThreaded();
void GenerateWorldSetCallback(GWDoneProc *proc);
@@ -101,8 +89,6 @@ void StartNewGameWithoutGUI(uint seed);
void ShowCreateScenario();
void StartScenarioEditor();
-extern class ThreadMutex *_modal_progress_work_mutex;
-extern class ThreadMutex *_modal_progress_paint_mutex;
extern bool _generating_world;
#endif /* GENWORLD_H */