2b27073156
(svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular
2006-06-27 21:25:53 +00:00
9b6fce70a2
(svn r5317) s/RGT_/ROADSIDE_/ and some minor changes
2006-06-19 20:13:50 +00:00
0a72639c2d
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
2006-06-10 08:37:41 +00:00
01aec41f69
(svn r5196) - Codechange: replace two incorrect uses of TILE_HEIGHT with TILE_SIZE / 2
2006-06-09 14:37:28 +00:00
be88e269b9
(svn r5155) - Remove the bridge branch merge (revision r5070)
2006-06-07 19:35:21 +00:00
4f5c84e720
(svn r5116) Move the overly generic GetDepotDirection() from a header to its only consumer
2006-06-05 08:34:39 +00:00
25a63ec7af
(svn r5070) Merged the bridge branch
...
-Feature: Bridges can now be placed above:
Any railway track combination (excluding depots and waypoints)
Any road combination (excluding depots)
Clear tiles (duh), including fields
Tunnel entrances
Bridge heads
Thanks to Tron for idea and implementation, KUDr for the yapf synchronization and many others for hours of testing
There are still a number of visual problems remaining, especially when electric railways are on or under the bridge.
DO NOT REPORT THOSE BUGS FOR THE TIME BEING please.
2006-06-02 13:05:41 +00:00
9b1bbf72ee
(svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity
2006-05-09 08:17:33 +00:00
5a8d992eaa
(svn r4529) - Codechange: Use proper naming for hex numbers in debug prints eg. 0xF3A6. Use fixed lengths where applicable (newgrf). Unfortunately '%#X' is unusable since it gives 0XFF3 and '%#x' gives 0xff3 while we want 0xFF3 :P
2006-04-22 13:56:16 +00:00
b91f2e4234
(svn r4389) -Fix: [NPF] Don't mark tiles when debugging in multiplayer, this will cause desyncs.
2006-04-12 15:08:27 +00:00
3c13420b82
(svn r4387) -Codechange: Use map accessors even for debugging purposes (npf).
...
-Codechange: Removed unused code from NPF
2006-04-12 14:17:07 +00:00
e79c36bf8c
(svn r4376) -Codechange Renamed GetSignalState to GetSignalStateByTrackdir
2006-04-12 08:28:03 +00:00
b0ee09fd1d
(svn r4349) Remove GetCrossingTransportType(), it's slightly overkill
2006-04-10 20:46:37 +00:00
8b151d8faa
(svn r4272) -Codechange: Moved the map-accessing stuff from station.h into station_map.h
2006-04-04 11:35:52 +00:00
446493149c
(svn r4215) -Codechange: Renamed *RoadStation* functions to *RoadStop* and moved them to station_map.h to keep consistency
2006-03-31 19:10:54 +00:00
a7d8ad0004
(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.
2006-03-29 16:30:26 +00:00
9ad72f2d47
(svn r4111) Fix/Remove some stale comments
2006-03-26 11:08:44 +00:00
9be713f1ae
(svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile
2006-03-24 08:55:08 +00:00
6d4e7d565d
(svn r4071) - Fix: [NPF] Trains & busses were unable to find a route when leaving a depot or bus stop. Small omission from r4023 (fix by glx)
2006-03-23 17:49:50 +00:00
8ea31d293a
(svn r4023) - Fix: [ 1453646 NPF ] Road vehicles planning through the back of depots and stations.
2006-03-22 16:37:59 +00:00
41ee22ed99
(svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions
2006-03-17 06:26:37 +00:00
83ba8bdf77
(svn r3908) Fix last commit (I'm saying that way too often *sigh*) (Pointed out by Celestar)
2006-03-16 15:28:44 +00:00
b8da06ddb1
(svn r3907) Replace many bridge related direct map accesses with calls to shiny new functions and mark some strange constructs with XXX
2006-03-16 15:16:27 +00:00
78083f0da7
(svn r3830) Move IsTunnelTile() from tile.h to tunnel_map.h and add IsTunnel(), which just checks for a tunnel, but not the tile type as IsTunnelTile() does
2006-03-12 15:04:03 +00:00
929fae7b68
(svn r3816) Use existing accessors
2006-03-11 09:10:46 +00:00
f2dc736554
(svn r3777) Add some functions to handle tunnels
2006-03-06 20:55:24 +00:00
586388c9f1
(svn r3767) Move all direction related enums and functions to a separate header
2006-03-05 12:34:55 +00:00
08720b6fd7
(svn r3750) Use INVALID_STATION instead of -1 in NPF
2006-03-03 20:54:54 +00:00
e9e4b7735f
(svn r3642) There is a 'npf' debug level for a reason, use that instead of bastardizing 'misc'. Also, pointers are checked against NULL in an if-statement
2006-02-21 01:15:59 +00:00
ea73b46684
(svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
2006-02-13 21:15:00 +00:00
84fb96fe85
(svn r3511) More whitespace ([FS#46] by Rubidium)
2006-02-01 07:36:15 +00:00
22dc05faf2
(svn r3510) Fiddle with whitespace and parentheses
2006-02-01 06:32:03 +00:00
4e09974975
(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)
...
- The only change is that the nsignalsw.grf file is kept and that existing nightlies with PBS signals get those signals converted to combo-signals.
2006-01-29 18:57:26 +00:00
42a9353ae2
(svn r3426) - Fix typo from r3019 -- only affected NPF debugging.
2006-01-24 18:38:06 +00:00
2148e1fa89
(svn r3271) Remove some debug statements of mine which somehow got into svn.
2005-12-08 09:12:25 +00:00
58785904a6
(svn r3142) Remove a now invalid case fall-through and use helper function instead of map access.
2005-11-05 18:32:21 +00:00
ae4a1f3675
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
2005-10-05 07:20:26 +00:00
aa08027ab3
(svn r2942) Staticise some functions
2005-09-11 15:01:00 +00:00
cd54bf48d1
(svn r2929) * Move DistanceTrack from map.c to npf.c and rename to NPFDistanceTrack.
...
* Make NPFDistanceTrack return the distance multiplied by NPF_TILE_LENGTH to prevent rounding
This should make ship and train pathfinding more accurate and faster.
* Update IsEndOfLine to prevent trains from trying to go off a slope onto a tunnel entrance.
2005-09-09 23:14:38 +00:00
a227065ab7
(svn r2701) Insert Id tags into all source files
2005-07-24 14:12:37 +00:00
23c20173b1
(svn r2696) Remove stray semicolons
2005-07-23 19:48:24 +00:00
aa29ee6eda
(svn r2674) - CodeChange: [pbs] Generalise the PSBISPbsDepot function so it can check if an arbitrary junction is a pbs junction. Preparations for making pbs more safe.
2005-07-22 08:40:19 +00:00
559babcdc9
(svn r2673) Include functions.h directly, not globally via openttd.h
2005-07-22 07:02:20 +00:00
1d11bbb34d
(svn r2625) - Fix: [pbs] Store the end of a train's reserved path explicitly. Prevents trains from unreserving eachothers paths in some cases.
...
- CodeChange: Use the TrackdirToTrack function instead of &7, and remove an unneeded variable.
2005-07-17 20:09:02 +00:00
95463428c8
(svn r2585) - Fix [Makefile]: some small cleanups, remove warnings, and add mersenne to makefile (Luca)
2005-07-15 21:28:26 +00:00
8c1d74162f
(svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
2005-07-13 18:04:01 +00:00
418e032fac
(svn r2538) - Fix: Use IsCompatibleRailType() function instead of checking this yourself.
2005-07-09 11:39:35 +00:00
5fb14350a0
(svn r2517) - Fix: [pbs] Detect end-of-lines properly regarding depots.
2005-07-04 15:25:06 +00:00
60ddaf95f0
(svn r2516) - Feature: [pbs] Implement path-based-signalling. This allows multiple trains within the same signal block, provided their paths dont intersect. For this the block must have all exit and entry signals be pbs signals. Place these by ctrl-clicking 4 times on a normal signal.
...
- Feature: [pbs] Implement autoplacement of pbs blocks, when a block has an entry and an exit pbs signal, covert the entire block to pbs. Can be turned off in the patch settings.
- Feature: [pbs] Allow showing of reserved status by making the tracks darker, when the pbs debug level is at least 1.
2005-07-04 14:58:55 +00:00
fb8e5f61b1
(svn r2514) - Codechange: [NPF] Move the checking of railtype into a funciton IsCompatibleRail().
...
- Codechange: [NPF] Check the railtype along a route against the engine type instead of against the previouse tile. This clears the way for electriefied rails.
- Add: [NPF] [ 1209644 ] A penalty for crossings (peter1138)
2005-07-03 13:02:54 +00:00
tron