cpp/openttd-patchpack/source Changeset - r21235:35f98986cac5

Changeset - r21235:35f98986cac5

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

fonsinchen - 10 years ago 2014-02-09 15:00:30
fonsinchen@openttd.org

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

2 files changed with 6 insertions and 5 deletions:

src/landscape.cpp

src/table/settings.ini

0 comments (0 inline, 0 general)

src/landscape.cpp

➞

Show inline comments

@@ @@ -721,12 +721,13 @@ void RunTileLoop() @@
 	 * shift register (LFSR). This allows a deterministic pseudorandom ordering, but
 	 * 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/ */
 	static const uint32 feedbacks[] = {
 xD8F, 0x1296, 0x2496, 0x4357, 0x8679, 0x1030E, 0x206CD, 0x403FE, 0x807B8, 0x1004B2, 0x2006A8
+xD8F, 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 */
 	uint count = 1 << (MapLogX() + MapLogY() - 8);

src/table/settings.ini

➞

Show inline comments

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

0 comments (0 inline, 0 general)