Files
@ r17167:68f47a8db1b5
Branch filter:
Location: cpp/openttd-patchpack/source/src/genworld.h - annotation
r17167:68f47a8db1b5
4.4 KiB
text/x-c
(svn r21916) -Fix [FS#4442]: the minimum speed needed for (realistic) acceleration to work properly can sometimes be more than the (temporary) maximum speed causing Clamp to "fail". Make sure that the minimum speed always overrules the maximum speed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r6179:c0508e7aefec r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r10208:ef8fcc3dc4ca r8254:b96be9ebfc6e r14299:dd117ea5dfbf r15173:a59afd6301a6 r14299:dd117ea5dfbf r14299:dd117ea5dfbf r6179:c0508e7aefec r6179:c0508e7aefec r15173:a59afd6301a6 r11825:adc3045ab0f2 r15173:a59afd6301a6 r15173:a59afd6301a6 r5475:3f5cd13d1b63 r14299:dd117ea5dfbf r14291:b7b327a367bf r14291:b7b327a367bf r14291:b7b327a367bf r14291:b7b327a367bf r14291:b7b327a367bf r9409:e2f52fd75f31 r9409:e2f52fd75f31 r16127:bc7a0303d95c r16127:bc7a0303d95c r16127:bc7a0303d95c r16126:3b43532e6039 r14299:dd117ea5dfbf r14299:dd117ea5dfbf r5475:3f5cd13d1b63 r14299:dd117ea5dfbf r14291:b7b327a367bf r6179:c0508e7aefec r6179:c0508e7aefec r6179:c0508e7aefec r6179:c0508e7aefec r14291:b7b327a367bf r10207:a1fc2f2a33db r6179:c0508e7aefec r6179:c0508e7aefec r14291:b7b327a367bf r14291:b7b327a367bf r8934:d5858392238b r6248:b940b09d7ab8 r5475:3f5cd13d1b63 r14299:dd117ea5dfbf r14291:b7b327a367bf r6179:c0508e7aefec r6179:c0508e7aefec r6179:c0508e7aefec r6179:c0508e7aefec r6179:c0508e7aefec r15734:ae8e2e185874 r6179:c0508e7aefec r6179:c0508e7aefec r6179:c0508e7aefec r6179:c0508e7aefec r5475:3f5cd13d1b63 r6248:b940b09d7ab8 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r14299:dd117ea5dfbf r5475:3f5cd13d1b63 r6247:96e840dbefcc r5475:3f5cd13d1b63 r14291:b7b327a367bf r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r6179:c0508e7aefec r6247:96e840dbefcc r14291:b7b327a367bf r14291:b7b327a367bf r6247:96e840dbefcc r14291:b7b327a367bf r6247:96e840dbefcc r6247:96e840dbefcc r6247:96e840dbefcc r5475:3f5cd13d1b63 r6179:c0508e7aefec r15227:6ee8e499e653 r14291:b7b327a367bf r14291:b7b327a367bf r6247:96e840dbefcc r6247:96e840dbefcc r5475:3f5cd13d1b63 r6247:96e840dbefcc r6247:96e840dbefcc r5475:3f5cd13d1b63 r11825:adc3045ab0f2 r11825:adc3045ab0f2 r15521:545d58d62089 r11825:adc3045ab0f2 r5475:3f5cd13d1b63 | /* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file genworld.h Functions related to world/map generation. */
#ifndef GENWORLD_H
#define GENWORLD_H
#include "company_type.h"
/** Constants related to world generation */
enum LandscapeGenerator {
/* Order of these enums has to be the same as in lang/english.txt
* Otherwise you will get inconsistent behaviour. */
LG_ORIGINAL = 0, ///< The original 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 GENWORLD_REDRAW_TIMEOUT = 200; ///< Timeout between redraws
/** Modes for GenerateWorld */
enum GenWorldMode {
GWM_NEWGAME = 0, ///< Generate a map for a new game
GWM_EMPTY = 1, ///< Generate an empty map (sea-level)
GWM_RANDOM = 2, ///< Generate a random map for SE
GWM_HEIGHTMAP = 3, ///< Generate a newgame from a heightmap
};
static const uint CUSTOM_SEA_LEVEL_NUMBER_DIFFICULTY = 4; ///< Value for custom sea level in difficulty settings.
static const uint CUSTOM_SEA_LEVEL_MIN_PERCENTAGE = 1; ///< Minimum percentage a user can specify for custom sea level.
static const uint CUSTOM_SEA_LEVEL_MAX_PERCENTAGE = 90; ///< Maximum percentage a user can specify for custom sea level.
typedef void GWDoneProc(); ///< Procedure called when the genworld process finishes
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
GenWorldMode mode; ///< What mode are we making a world in
CompanyID lc; ///< The local_company before generating
uint size_x; ///< X-size of the map
uint size_y; ///< Y-size of the map
GWDoneProc *proc; ///< Proc that is called when done (can be NULL)
GWAbortProc *abortp; ///< Proc that is called when aborting (can be NULL)
class ThreadObject *thread; ///< The thread we are in (can be NULL)
};
/** Current stage of world generation process */
enum GenWorldProgress {
GWP_MAP_INIT, ///< Initialize/allocate the map, start economy
GWP_LANDSCAPE, ///< Create the landscape
GWP_ROUGH_ROCKY, ///< Make rough and rocky areas
GWP_TOWN, ///< Generate towns
GWP_INDUSTRY, ///< Generate industries
GWP_OBJECT, ///< Generate objects (radio tower, light houses)
GWP_TREE, ///< Generate trees
GWP_GAME_INIT, ///< Initialize the game
GWP_RUNTILELOOP, ///< Runs the tile loop 1280 times to make snow etc
GWP_GAME_START, ///< Really prepare to start the game
GWP_CLASS_COUNT
};
/**
* Check if we are currently in the process of generating a world.
* @return are we generating world?
*/
static inline bool IsGeneratingWorld()
{
extern GenWorldInfo _gw;
return _gw.active;
}
/* genworld.cpp */
bool IsGenerateWorldThreaded();
void GenerateWorldSetCallback(GWDoneProc *proc);
void GenerateWorldSetAbortCallback(GWAbortProc *proc);
void WaitTillGeneratedWorld();
void GenerateWorld(GenWorldMode mode, uint size_x, uint size_y, bool reset_settings = true);
void AbortGeneratingWorld();
bool IsGeneratingWorldAborted();
void HandleGeneratingWorldAbortion();
/* genworld_gui.cpp */
void SetNewLandscapeType(byte landscape);
void SetGeneratingWorldProgress(GenWorldProgress cls, uint total);
void IncreaseGeneratingWorldProgress(GenWorldProgress cls);
void PrepareGenerateWorldProgress();
void ShowGenerateWorldProgress();
void StartNewGameWithoutGUI(uint seed);
void ShowCreateScenario();
void StartScenarioEditor();
extern class ThreadMutex *_genworld_mapgen_mutex;
extern class ThreadMutex *_genworld_paint_mutex;
extern bool _generating_world;
#endif /* GENWORLD_H */
|