Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,808 Commits 12 Branches 180 Tags 451 MiB
bd28390b2e
Commit Graph

51 Commits

Author SHA1 Message Date
rubidium
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
tron
4f092c8de8 (svn r4764) Move some functions from rail.h to rail_map.h 2006-05-07 07:01:48 +00:00
tron
0347fb2ab6 (svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums 2006-04-23 13:48:16 +00:00
celestar
6935fb6455 (svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions 2006-04-17 19:09:30 +00:00
celestar
e79c36bf8c (svn r4376) -Codechange Renamed GetSignalState to GetSignalStateByTrackdir 2006-04-12 08:28:03 +00:00
peter1138
5f24141cb8 (svn r4354) [Elrail][NewGRF] Codechange: Drawing of custom waypoints with custom ground sprites used the index of the rail type as an offset. With the introduction of elrails this offset is incorrect, so instead there is now a lookup table within the RailTypeInfo struct to explicitly list the offset. 2006-04-11 10:45:06 +00:00
tron
d38964e49a (svn r4351) Simplify ReverseTrackdir() to use a simple arithmetic operation instead of a table lookup 2006-04-11 04:49:23 +00:00
tron
b0ee09fd1d (svn r4349) Remove GetCrossingTransportType(), it's slightly overkill 2006-04-10 20:46:37 +00:00
tron
f4a8818dbf (svn r4348) Move IsLevelCrossing() from rail.h to road_map.h 2006-04-10 20:38:59 +00:00
orudge
0fe27c16af (svn r4204) - Get trunk compiling again on OS/2 2006-03-31 16:01:59 +00:00
celestar
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
tron
77e5cf4bc1 (svn r3979) Move GetRailFoundation() to rail_map.h and use it and friends to get information about rail tiles 2006-03-19 12:06:12 +00:00
tron
d8dcedcfd2 (svn r3946) Add short hand names for common track combinations 2006-03-18 13:20:50 +00:00
tron
d00222b0f7 (svn r3941) Get rid of RAIL_TYPE_SPECIAL 2006-03-18 09:06:07 +00:00
tron
27d7d42404 (svn r3913) Move declarations to rail_map.h so rail.h is dependent on rail_map.h and not the other way round 2006-03-17 07:02:34 +00:00
tron
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
tron
2232412f59 (svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore) 2006-03-16 21:44:58 +00:00
tron
586388c9f1 (svn r3767) Move all direction related enums and functions to a separate header 2006-03-05 12:34:55 +00:00
tron
40fd4377b0 (svn r3747) Change HASBIT() to return 0/1 instead of 0/value of tested bit, because the name suggests it does the former and current behavior broke in some places in very subtle ways (for example HASBIT(x, 0) != HASBIT(y, 1) doesn't work, returning a bool after HASBIT(x, 9) neither) 2006-03-03 19:42:09 +00:00
tron
793613a286 (svn r3697) Rename DIAG1/DIAG2 to X resp. Y as this conveys a bit better in which direction a pieces of rail goes 2006-03-01 09:40:34 +00:00
tron
453b30e387 (svn r3564) Several smaller changes: 
- Don't treat non-booleans as booleans
- Reduce variable scope
- Bracing
- Use DeMorgan's law to make conditionals easier to read
- if cascade -> switch
- Replace some magic numbers by symbolic names
- Avoid assignments within other statements
 2006-02-06 09:18:04 +00:00
tron
22dc05faf2 (svn r3510) Fiddle with whitespace and parentheses 2006-02-01 06:32:03 +00:00
Darkvater
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
Darkvater
f4e7d3203a (svn r3466) - Codechange: Some changes to increase readability of signals code. 2006-01-29 10:50:27 +00:00
peter1138
452ae7470b (svn r3443) - Fix signed/unsigned comparison warning when compiling with gcc 2.95 (tokai) 2006-01-26 17:43:31 +00:00
tron
e272b03fee (svn r3365) Staticise 36 functions 2006-01-05 12:40:50 +00:00
matthijs
128317d3ec (svn r3329) - Doc: Some documentation cleanups. 
- Add: TracksOverlap() (from the map branch), TrackdirBitsToTrackBits(), DiagdirReachesTrackdirs(), DiagdirReachesTracks().
 - Fix: Infinite loop in the pathfinder introduces in r3321.
 2005-12-21 13:53:44 +00:00
tron
2cc2154ad2 (svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes 
nothing spectacular, just some stuff, which piled up
 2005-10-22 06:39:32 +00:00
celestar
5f604ec63a (svn r3065) -Codechange/Add: Modified the bridge drawing code so that the basic offset is read from the RailTypeInfo struct. This is (hopefully) the last DrawTile change on the way to electrified railways. While being at it, de-mystified the function a bit and added some asserts. 2005-10-19 08:34:37 +00:00
tron
66bf4f863d (svn r3049) Replace byte/int/uint by RailType where appropriate 2005-10-16 09:13:04 +00:00
tron
f97d1274bc (svn r3040) Don't deduce the cursor sprites when building rails from magic numbers, but fetch them from the central rail info array. 2005-10-14 08:11:18 +00:00
tron
7520ef8f33 (svn r3037) Don't deduce the sprites for tunnels and level crossings from magic numbers, but fetch them from the central rail info array. This is a preparation step for electrified rails 2005-10-13 16:00:14 +00:00
peter1138
f8d1267d71 (svn r2998) -Codechange: Split rail drawing code off from DrawTile_Rail into a separate function to be used elsewhere. (Deja vu?) 2005-09-29 20:20:34 +00:00
Darkvater
8e6a911700 (svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters 
- change a lot of byte player types to PlayerID
- beautify header files, same "#endif /* filename */" ending
 2005-09-18 20:56:44 +00:00
celestar
1d527c58cb (svn r2798) -Codechange: Unified the rail toolbars into one that is modified by 
request using the RailtypeInfo struct
 2005-08-03 11:08:13 +00:00
celestar
fcf5ace08f (svn r2774) -Codechange: Removed TRACKTYPE_SPRITE_PITCH globally and replaced it by a member of RailtypeInfo 2005-07-31 22:53:57 +00:00
ludde
24986e9144 (svn r2756) Renamed railtypes into _railtypes 
Renamed railtypes.c into railtypes.h, all other tables are in .h files. (It should be in the tables dir but I couldn't figure out how to get it there without deleting it first).
Added const and extern.
 2005-07-29 22:13:04 +00:00
celestar
1736566e22 (svn r2753) -Codechange: Introduced a new struct "RailtypeInfo" to store rail type specific information. Begun populating it with a bunch of sprites, more to come later. This should result in cleaner, more compact code which allows easy introduction of new railtypes. 2005-07-29 21:36:02 +00:00
celestar
3868b151a9 (svn r2752) -Doc: Added some doxygen stuff to rail.h. I'm gonna mess around with this file and wanted to get rid of this first 2005-07-29 19:35:23 +00:00
tron
a227065ab7 (svn r2701) Insert Id tags into all source files 2005-07-24 14:12:37 +00:00
tron
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
celestar
b45eee3157 (svn r2541) -Feature: Modified IsCompatibleRail so that an engine can move on more 
than one railtype (like Diesel engines on electrified rail).
-Codechange: Use IsCompatibleRail where it should be used
 2005-07-10 01:25:17 +00:00
hackykid
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
matthijs
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
celestar
ee97db70c5 (svn r2507) -Fix: Forgot to change an enum in rail.h in r2499 (thanks blathijs for 
pointing it out)
 2005-07-02 13:03:56 +00:00
matthijs
7549cb5271 (svn r2473) - Add: VehicleMayEnterTile(), which checks if the tile owner of a tile is correct for a vehicle to enter it. Based upon glx's code. 
- Fix: [ 1203769 ] [NPF] NPF tries to plan over bridges, through tunnels, over level crossings of other players. (glx)
- Codechange: Renamed TRANSPORT_MAX to TRANSPORT_END and added INVALID_TRANSPORT.
- Codechange: Moved IsLevelCrossing() from tile.h to rail.h
- Add: GetCrossingTransportType(), which returns the transport type (road, rail) of both tracks on a level crossing.
- Removed old TODO that was fulfilled already.
 2005-06-22 22:38:18 +00:00
matthijs
d90840f7f8 (svn r2456) * Prettyfied npf.c using enums and wrappers from rail.h. 
* Moved GetTileRailType() from npf.c to rail.[ch].
 2005-06-17 17:11:05 +00:00
matthijs
958df2b229 (svn r2454) * Codechange: Move #include "stdafx.h" and "openttd.h" from rail.h to rail.c 
* Codechange: Move declaration of lookup arrays into the functions that need them. This doesn't pollute the global namespace with the array names.
* Add: rail.h to the openttd.vcproj and openttd.dsp for MSVC.
 2005-06-17 11:30:50 +00:00
matthijs
3c133f1f53 (svn r2453) * CodeChange: Declared the lookup arrays in rail.h as extern, so the linker will complain if they are not defined (ie when rail.c is not included). 2005-06-17 09:53:22 +00:00
matthijs
8e53533786 (svn r2450) * Codechange: Replaced all uses of the arrays in tile.h with calls to the associated wrapper functions. 
* Codechange: Made npf.c use some map array accessing wrappers instead of direct access.
* Codechange/Fix: Named every enum in tile.h. Fixes a nasty bug on MSVC where arrays would be initialised with zeroes (tnx Asterix_)
* Removed magic numbers from tables in tile.c.
* Added some explicit casts in tile.h.
 2005-06-17 00:22:46 +00:00