Mercurial > hg > openttd
changeset 16425:c8d1d7db1807 draft
(svn r21141) -Codechange: Use the new 'frame' variable for the bridge entry code as well (Hirundo)
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Wed, 10 Nov 2010 23:16:28 +0000 |
| parents | 81dfd7952eee |
| children | b3126a163849 |
| files | src/tunnelbridge_cmd.cpp |
| diffstat | 1 files changed, 2 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -1592,13 +1592,8 @@ } if (vdir == dir) { - switch (dir) { - default: NOT_REACHED(); - case DIAGDIR_NE: if ((x & 0xF) != 0) return VETSB_CONTINUE; break; - case DIAGDIR_SE: if ((y & 0xF) != TILE_SIZE - 1) return VETSB_CONTINUE; break; - case DIAGDIR_SW: if ((x & 0xF) != TILE_SIZE - 1) return VETSB_CONTINUE; break; - case DIAGDIR_NW: if ((y & 0xF) != 0) return VETSB_CONTINUE; break; - } + /* Vehicle enters bridge at the last frame inside this tile. */ + if (frame != TILE_SIZE - 1) return VETSB_CONTINUE; switch (v->type) { case VEH_TRAIN: { Train *t = Train::From(v);