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

(svn r26323) -Fix: update some constants related to map size.

release/1.4
fonsinchen 2014-02-09 15:00:30 +00:00
parent 77e62f0b98
commit e4c7c8876b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/landscape.cpp
View File

@ -721,12 +721,13 @@ void RunTileLoop()
* shift register (LFSR). This allows a deterministic pseudorandom ordering, but * shift register (LFSR). This allows a deterministic pseudorandom ordering, but
* still with minimal state and fast iteration. */ * still with minimal state and fast iteration. */
/* Maximal length LFSR feedback terms, from 12-bit (for 64x64 maps) to 22-bit (for 2048x2048 maps). /* Maximal length LFSR feedback terms, from 12-bit (for 64x64 maps) to 24-bit (for 4096x4096 maps).
* Extracted from http://www.ece.cmu.edu/~koopman/lfsr/ */ * Extracted from http://www.ece.cmu.edu/~koopman/lfsr/ */
static const uint32 feedbacks[] = { static const uint32 feedbacks[] = {
0xD8F, 0x1296, 0x2496, 0x4357, 0x8679, 0x1030E, 0x206CD, 0x403FE, 0x807B8, 0x1004B2, 0x2006A8 0xD8F, 0x1296, 0x2496, 0x4357, 0x8679, 0x1030E, 0x206CD, 0x403FE, 0x807B8, 0x1004B2, 0x2006A8, 0x4004B2, 0x800B87
}; };
const uint32 feedback = feedbacks[MapLogX() + MapLogY() - 12]; assert_compile(lengthof(feedbacks) == 2 * MAX_MAP_SIZE_BITS - 2 * MIN_MAP_SIZE_BITS + 1);
const uint32 feedback = feedbacks[MapLogX() + MapLogY() - 2 * MIN_MAP_SIZE_BITS];
/* We update every tile every 256 ticks, so divide the map size by 2^8 = 256 */ /* We update every tile every 256 ticks, so divide the map size by 2^8 = 256 */
uint count = 1 << (MapLogX() + MapLogY() - 8); uint count = 1 << (MapLogX() + MapLogY() - 8);

4
src/table/settings.ini
View File

@ -480,7 +480,7 @@ from = 159
guiflags = SGF_NO_NETWORK guiflags = SGF_NO_NETWORK
def = 64 def = 64
min = 1 min = 1
max = 2048 max = MAX_MAP_SIZE
interval = 1 interval = 1
str = STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH str = STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH
strhelp = STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT strhelp = STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT
@ -494,7 +494,7 @@ from = 159
guiflags = SGF_NO_NETWORK guiflags = SGF_NO_NETWORK
def = 64 def = 64
min = 1 min = 1
max = 2048 max = MAX_MAP_SIZE
interval = 1 interval = 1
str = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH str = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH
strhelp = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT strhelp = STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT