Commit Graph

88 Commits (3723f3f300fa2dbfefbe5d576f8e775d2ae6e5ed)

Author SHA1 Message Date
tron a2362674e3 (svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc. 18 years ago
peter1138 23c672edb8 (svn r5196) - Codechange: replace two incorrect uses of TILE_HEIGHT with TILE_SIZE / 2 18 years ago
tron 7fd88e5798 (svn r5155) - Remove the bridge branch merge (revision r5070) 18 years ago
tron cfdbb53a82 (svn r5116) Move the overly generic GetDepotDirection() from a header to its only consumer 18 years ago
celestar b618b75c9b (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.
18 years ago
rubidium 3dae1a9bba (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 18 years ago
Darkvater 0a0b8f22aa (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 18 years ago
matthijs 7dca474b5f (svn r4389) -Fix: [NPF] Don't mark tiles when debugging in multiplayer, this will cause desyncs. 19 years ago
celestar 86138ce3cc (svn r4387) -Codechange: Use map accessors even for debugging purposes (npf).
-Codechange: Removed unused code from NPF
19 years ago
celestar 62ded2f58d (svn r4376) -Codechange Renamed GetSignalState to GetSignalStateByTrackdir 19 years ago
tron 93789afac7 (svn r4349) Remove GetCrossingTransportType(), it's slightly overkill 19 years ago
celestar 715bee332b (svn r4272) -Codechange: Moved the map-accessing stuff from station.h into station_map.h 19 years ago
celestar 2ab5b8e666 (svn r4215) -Codechange: Renamed *RoadStation* functions to *RoadStop* and moved them to station_map.h to keep consistency 19 years ago
celestar 6c44bf5012 (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. 19 years ago
tron d0a445db41 (svn r4111) Fix/Remove some stale comments 19 years ago
tron f6285a659c (svn r4079) Add GetSation{Index,ByTile}() to get the station index resp. the station from a tile 19 years ago
matthijs 4e3714b391 (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) 19 years ago
matthijs 3c76671078 (svn r4023) - Fix: [ 1453646 NPF ] Road vehicles planning through the back of depots and stations. 19 years ago
tron 4fb11f23ad (svn r3912) Move the signal type enum and GetSignalType() to rail_map.h; also add SetSignalType() and use the functions 19 years ago
tron 7bd2b37fe7 (svn r3908) Fix last commit (I'm saying that way too often *sigh*) (Pointed out by Celestar) 19 years ago
tron 6e988259a4 (svn r3907) Replace many bridge related direct map accesses with calls to shiny new functions and mark some strange constructs with XXX 19 years ago
tron 0100871412 (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 19 years ago
tron 25606a2e0b (svn r3816) Use existing accessors 19 years ago
tron af42610321 (svn r3777) Add some functions to handle tunnels 19 years ago
tron f6176a89f9 (svn r3767) Move all direction related enums and functions to a separate header 19 years ago
tron 2942939ad1 (svn r3750) Use INVALID_STATION instead of -1 in NPF 19 years ago
Darkvater a83de6a33c (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 19 years ago
tron 5352e9fbcb (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 19 years ago
tron 1c3e8630fe (svn r3511) More whitespace ([FS#46] by Rubidium) 19 years ago
tron 9712d6f639 (svn r3510) Fiddle with whitespace and parentheses 19 years ago
Darkvater 4014e36aec (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.
19 years ago
peter1138 063aa48b0b (svn r3426) - Fix typo from r3019 -- only affected NPF debugging. 19 years ago
hackykid c50ef5bc07 (svn r3271) Remove some debug statements of mine which somehow got into svn. 19 years ago
peter1138 acf4b5181d (svn r3142) Remove a now invalid case fall-through and use helper function instead of map access. 19 years ago
tron 39f5dbfd3b (svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB 19 years ago
tron 5d2c743ef4 (svn r2942) Staticise some functions 19 years ago
matthijs 6f45959d1e (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.
19 years ago
tron 647cbd6bdd (svn r2701) Insert Id tags into all source files 19 years ago
tron 5293ee67ca (svn r2696) Remove stray semicolons 19 years ago
hackykid aed6f08640 (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. 19 years ago
tron 54cbd01825 (svn r2673) Include functions.h directly, not globally via openttd.h 19 years ago
hackykid 552aa1b4dc (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.
19 years ago
Darkvater bc11fe03ee (svn r2585) - Fix [Makefile]: some small cleanups, remove warnings, and add mersenne to makefile (Luca) 19 years ago
tron a4bf608d40 (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. 19 years ago
hackykid 3091f97c41 (svn r2538) - Fix: Use IsCompatibleRailType() function instead of checking this yourself. 19 years ago
hackykid 6b3b784c85 (svn r2517) - Fix: [pbs] Detect end-of-lines properly regarding depots. 19 years ago
hackykid ab9c6f126d (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.
19 years ago
matthijs e675794812 (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)
19 years ago
tron 7a372227ff (svn r2489) static, bracing style and use clamp() 19 years ago
tron 9617614b04 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY 19 years ago