changeset 2891:69a3fba739d6 draft

(svn r3445) - Fix: [ 1415379 ] Enhance documentation of lift destination - Fix: wrong documentation of trees (Tron)
author Darkvater <Darkvater@openttd.org>
date Thu, 26 Jan 2006 18:36:14 +0000
parents 403b7feef558
children 4f2bae38f077
files docs/landscape.html docs/landscape_grid.html town_cmd.c
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/docs/landscape.html
+++ b/docs/landscape.html
@@ -290,7 +290,7 @@
 <ul>
 <li>m1 bits 6..0: position of the lift</li>
 <li>m1 bit 7: if set the lift is moving</li>
-<li>m5 bit 7: if set then m5 bits 5..0 hold the final position of the lift divided by 6 (valid values 0..6 except 1)</li>
+<li>m5 bit 7: if set then m5 bits 5..0 hold the destination floor of the lift, which could be 0..6, except 1, so the building has 6 effective floors. This due to the fact that the first floor is 2 'normal' floors high. One 'normal' floor has a height of 6 lift positions.</li>
 </ul></li>
 </ul>
 </td></tr>
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -134,7 +134,7 @@
       <td>4</td>
       <td class="caption">trees</td>
       <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO OO</span>XX XXXX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span> XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XX<span class="free">OO</span></td>
       <td class="bits">XXXX XXXX</td>
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -174,6 +174,10 @@
 
 		_m[tile].m1 |= 0x80;
 
+		/** Building has 6 floors, number 0 .. 6, where 1 is illegal.
+		 *  This is due to the fact that the first floor is, in the graphics,
+		 *  the height of 2 'normal' floors.
+		 *  Furthermore, there are 6 lift positions from floor N (incl) to floor N + 1 (excl) */
 		do {
 			i = (Random() & 7) - 1;
 		} while (i < 0 || i == 1 || i * 6 == old);