celestar
b5b348bdce
(svn r3992) -Fix: Rewrote the code to determine whether a rail-tile can be terraformed.
...
Fixes a bug where you could terraform a tunnel (fixed by r3228, but reverted that one)
Fixes a bug introduced by r3228 which allowed steep rail tiles resulting in ... unwanted effects such as display artifacts.
That means the terraform feature should not work as intended; it also uses _valid_tileh_slopes to determine valid configurations instead of hand-brewn stuff.
TODO: _terraform_err_tile and similar TileIndices should have INVALID_TILE as "unused", not 0. (0 is a valid tile).
2006-03-20 16:43:48 +00:00
tron
a8b1d3c0da
(svn r3988) Remove the info about valid rails on shore tiles. It's the same as for any other sloped tile
2006-03-19 19:56:57 +00:00
tron
453a925d72
(svn r3986) Add [GS]etCrossingRoadOwner
2006-03-19 19:33:19 +00:00
tron
1f1d30cb92
(svn r3985) Make CmdBuildSingleRail() a bit more comprehensible
2006-03-19 17:52:02 +00:00
tron
4d71a903b5
(svn r3983) Use existing functions to access tree and road info
2006-03-19 16:57:48 +00:00
tron
ec34ed24ef
(svn r3982) Fix last commit. I got confused by some strange test, which did nothing
2006-03-19 14:43:23 +00:00
tron
a90e46bf03
(svn r3981) More work for the rail accessing functions and enums
2006-03-19 13:48:08 +00:00
tron
bf3811122d
(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
54c4a8e780
(svn r3976) Fix typo in r3946
2006-03-19 06:50:19 +00:00
tron
76ae9585dd
(svn r3946) Add short hand names for common track combinations
2006-03-18 13:20:50 +00:00
tron
fc08e888c3
(svn r3942) GetRailType() != GetRailTileType(), fix r3941
2006-03-18 11:38:43 +00:00
tron
dabfa14778
(svn r3941) Get rid of RAIL_TYPE_SPECIAL
2006-03-18 09:06:07 +00:00
tron
7b1c7c31fb
(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()
2006-03-17 10:10:31 +00:00
tron
4fb11f23ad
(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
0e3699bd5c
(svn r3911) Add functions to retrieve/set the signal variant (electric/semaphore)
2006-03-16 21:44:58 +00:00
tron
6e988259a4
(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
Darkvater
a390b6e4d1
(svn r3893) - Fix: Properly set back the owner of a crossing/road-under bridge after removing it. For crossings we can always use .m2 because it is already 0 when not owned by a town.
2006-03-15 21:27:19 +00:00
Darkvater
3fd42fab5d
(svn r3876) - Fix: We know on a level crossing's town owner of the road (if any); it is in m2 so properly set it back when the crossing's removed.
2006-03-14 23:28:04 +00:00
tron
8505f4ed41
(svn r3851) Rail depots only have an entrance at one side, therefore use UpdateSignalsOnSegment() instead of SetSignalsOnBothDir()
2006-03-13 20:12:35 +00:00
tron
26815f7405
(svn r3846) Add functions to set the type of stuff (clear, water, rail, road) under bridges
2006-03-13 12:55:20 +00:00
tron
eeb5bf41a1
(svn r3831) Add and use GetRailDepotDirection()
2006-03-12 16:13:16 +00:00
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
2006-03-12 15:04:03 +00:00
tron
ee03f15f27
(svn r3803) Change the second parameter of UpdateSignalsOnSegment() from Direction to DiagDirection as that's what it really operates on
2006-03-09 12:32:25 +00:00
tron
8cfcdaa733
(svn r3783) Replace further ints and magic numbers by Direction, DiagDirection and friends
2006-03-08 06:55:33 +00:00
tron
af42610321
(svn r3777) Add some functions to handle tunnels
2006-03-06 20:55:24 +00:00
tron
49cb8eb470
(svn r3776) Replace many ints and magic numbers by Direction, DiagDirection and friends
2006-03-06 20:28:28 +00:00
tron
4efa560ffc
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
2006-03-05 10:19:33 +00:00
tron
8d3e42fe3c
(svn r3760) Replace some magic numbers for checking for a suitable slope for a level crossing by some less magic numbers. Quite similar to r3699, though this time for placing the rails
2006-03-04 13:52:52 +00:00
tron
5d6ec6b4f0
(svn r3698) Add GetCrossingRailBits() and ComplementRoadBits(). Simplify the code by using them
2006-03-01 12:31:39 +00:00
tron
7b106a3d8f
(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
28fc670fe2
(svn r3696) Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
2006-03-01 08:56:38 +00:00
tron
a8febcf209
(svn r3689) Add functions to turn a tile into either a normal road tile, a level crossing or a road depot
2006-02-28 21:19:50 +00:00
tron
b26d54585f
(svn r3660) Convert further road bits and type references to the functions/enums
2006-02-23 12:24:19 +00:00
tron
2f8e3dcc05
(svn r3658) Add functions and symbolic names to retrieve road tile types and road pieces
2006-02-23 08:20:28 +00:00
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
2006-02-13 21:15:00 +00:00
tron
087fe86ed2
(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
1c3e8630fe
(svn r3511) More whitespace ([FS#46] by Rubidium)
2006-02-01 07:36:15 +00:00
tron
9712d6f639
(svn r3510) Fiddle with whitespace and parentheses
2006-02-01 06:32:03 +00:00
tron
244d4ab5cb
(svn r3490) -Fix: A bunch (10) of off-by-one errors when checking if a TileIndex points to a tile on the map
2006-01-30 17:18:45 +00:00
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.
2006-01-29 18:57:26 +00:00
Darkvater
9eb1589827
(svn r3466) - Codechange: Some changes to increase readability of signals code.
2006-01-29 10:50:27 +00:00
tron
461d76a40c
(svn r3389) -Fix: No fence was placed when placing fences and the neighbouring tile is a rail configuration which permits a fence but has a signal
...
(Per request of peter1138 the above line does not contain any commas)
2006-01-07 17:26:37 +00:00
tron
72270695ed
(svn r3387) Restructure the code, which places fences along railroad tracks.
...
This includes no functional changes, just some cleanup before some bugfix
2006-01-07 16:30:49 +00:00
matthijs
138761e78e
(svn r3369) - Codechange: Replace tables _signals_table, _signals_table_other and _signals_table_both by the equivalent calls to rail.h functions.
...
- Codechange: Add a few constants.
2006-01-06 00:08:00 +00:00
tron
318fe153eb
(svn r3365) Staticise 36 functions
2006-01-05 12:40:50 +00:00
tron
a2533d5ee6
(svn r3298) Remove unused and write-only variables
2005-12-14 06:28:48 +00:00
tron
9822b4d755
(svn r3297) Staticise
2005-12-14 06:20:23 +00:00
peter1138
80986fcd32
(svn r3282) - Codechange: Replace tests against CMD_ERROR with CmdFailed()
2005-12-10 12:05:39 +00:00
peter1138
479a9c2e47
(svn r3212) - Waypoints/Depots: Store waypoint index in m2 for waypoints. This moves the ground type bits from m2 to m4 for waypoints and depots (leaving room for depot index in m2 in future), and moves the custom graphics ID to the waypoint struct.
...
- Waypoints: Until now stat_id was saved but never assigned to. Instead we now save the GRFID/local index of the custom graphics so that GRF file changes can leave graphics intact.
2005-11-16 22:20:15 +00:00
truelight
cd1ad24723
(svn r3210) -Codechange: use IsRailWaypoint where possible (instead of magicnumbers)
...
-Codechange: IsRailWaypoint should take 'tile', not 'm5'
2005-11-16 14:41:01 +00:00
peter1138
a56ffc6a0f
(svn r3209) In TileLoop_Track(), use names based on function rather than their place in the map array.
2005-11-16 14:30:24 +00:00
tron
3848d103c8
(svn r3187) Simplify overly complicated ifs, especially if (foo) return false; else return true; is confusing
2005-11-15 09:47:25 +00:00
tron
84a16a0b30
(svn r3184) GB/SB
2005-11-15 08:49:46 +00:00
tron
9d0e7b6458
(svn r3181) -Bracing
...
-Indentation
-Whitespace
-DeMorgan's Law
-Test with NULL or 0 for non-booleans
-'\0' instead of 0 for chars
-Remove redundantly redundant comments (like DoFoo(); // Do foo)
-Join multiple short lines with a single statement
-Split single lines with multiple statements
-Avoid assignments in if
2005-11-14 19:48:04 +00:00
tron
53f00c8f9d
(svn r3173) Use the trinary operator and switch to improve readability
...
Also align short cases nicely
2005-11-13 14:54:09 +00:00
peter1138
7bbf614796
(svn r3168) - NewGRF: Fix "typo" in waypoint drawer :/
2005-11-12 00:29:13 +00:00
peter1138
ce9f2fe823
(svn r3166) Constify read-only accesses of custom stations
2005-11-11 20:34:16 +00:00
peter1138
4c6a67a723
(svn r3141) Replace incorrect railtype bitmask in CmdRailTrackHelper with appropriate GB()
2005-11-05 18:21:28 +00:00
tron
181d586a7c
(svn r3078) Some more stuff, which piled up:
...
- const, whitespace, indentation, bracing, GB/SB, pointless casts
- use the trinary operator where appropriate
- data types (uint[] -> AcceptedCargo, ...)
- if cascade -> switch
- if (ptr) -> if (ptr != NULL)
- DeMorgan's Law
- Fix some comments
- 0 -> '\0', change magic numbers to symbolic constants
2005-10-23 13:04:44 +00:00
tron
0b936c3222
(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
tron
d7cbd0d4c3
(svn r3073) int/byte -> EngineID/PlayerID/VehicleID
...
0/-1 -> INVALID_ENGINE
0x10 -> OWNER_NONE
2005-10-20 17:43:13 +00:00
tron
71d293f2a3
(svn r3066) Constify the parameter of GetSlopeZ_*()
2005-10-19 14:49:46 +00:00
tron
e3d1e43559
(svn r3049) Replace byte/int/uint by RailType where appropriate
2005-10-16 09:13:04 +00:00
tron
7ab7d79190
(svn r3028) s/255/OWNER_SPECTATOR/
2005-10-10 10:36:37 +00:00
Darkvater
6423de9290
(svn r3025) -Fix: Rail convert issue introduced in r3019
2005-10-07 15:53:33 +00:00
tron
39f5dbfd3b
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
2005-10-05 07:20:26 +00:00
peter1138
fdebfbe8d5
(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
4a58250cb9
(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
Darkvater
c0c75ef16e
(svn r2951) - Fix: [ 1259345 ] Changing engine in netgame opens train window for everyone
...
- Add IsLocalPlayer() which substitutes _local_player == _current_player
2005-09-14 18:03:38 +00:00
truelight
4936e93654
(svn r2948) -Fix: the old AI needs a special flag that triggers all kind of special
...
abilities you really don't want to know about (free bridges, etc..)
I removed this flag some revisions ago, but the Aircraft part
depends on it, so I re-enabled it again..
2005-09-13 12:19:27 +00:00
tron
86fcdfbe2e
(svn r2890) Fix some signed/unsigned comparison warnings (tokai)
2005-08-25 16:53:51 +00:00
ludde
9a060a0f24
(svn r2781) Fix some of the issues with variables in .h files.
2005-08-01 16:31:19 +00:00
celestar
5352ad4582
(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
b8c9194b7c
(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
f287f2ff8d
(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
a3739aecdf
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
...
by enums. There remains work in gfx.c to move the "transparency" and
"recolor" bits around to make space for more sprites. However, 2800
additional sprites can now be loaded. There also remains cleanup and
Doxygen work on many of the header files.
2005-07-24 15:56:31 +00:00
tron
647cbd6bdd
(svn r2701) Insert Id tags into all source files
2005-07-24 14:12:37 +00:00
tron
54cbd01825
(svn r2673) Include functions.h directly, not globally via openttd.h
2005-07-22 07:02:20 +00:00
celestar
1fed0046ac
(svn r2658) -Codechange: Use MAKE_TRANSPARENT to display a transparented sprite
2005-07-20 22:05:13 +00:00
tron
f09638ad3d
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
2005-07-20 15:29:28 +00:00
hackykid
d5b305852f
(svn r2621) - Fix: [pbs] When removing tracks, clear their reserved status.
2005-07-17 18:48:45 +00:00
celestar
de19186be3
(svn r2595) -Codechange: Introduced "IsSteepTileh" to find whether a tile is steep
...
(i.e. spans two height levels) and use it throughout the code.
-Codechange: Add CanBuildDepotByTileh to find if a tile is suitable to
build a depot on it. Wraps some bitmagic which seems quite unreadable at
first glance
2005-07-16 23:47:37 +00:00
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.
2005-07-13 18:04:01 +00:00
Darkvater
bf794fad62
(svn r2529) - Fix: PBS signals showed up as normal signals with the query tool
...
- Update landscape_grid.html to show busy bits used by PBS.
2005-07-07 22:15:34 +00:00
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.
2005-07-04 14:58:55 +00:00
celestar
d07e1a875e
(svn r2515) -Codechange: Removed a good deal of magic sprite numbers in the rail drawing code, and placed neatly into arrays and enums. This also makes way to implement more railtypes without having to do tons of ugly hacks.
2005-07-04 10:01:06 +00:00
tron
6923badbba
(svn r2505) Remove some unnecessary #includes
2005-07-01 15:46:27 +00:00
celestar
189a1c4017
(svn r2499) -Codechange: Moved the semaphore bit from bit 2 to bit 3 in _map_hi for rails, in order to make way for pbs
2005-06-30 13:24:17 +00:00
tron
5cbd8b598c
(svn r2492) Remove some pointless casts and fix some nearby indentation
2005-06-27 06:57:24 +00:00
tron
9617614b04
(svn r2487) Replace TILE_XY by TileXY/TileDiffXY
2005-06-25 16:44:57 +00:00
tron
2b73dec567
(svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY
2005-06-25 06:15:43 +00:00
tron
a733fede9b
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
2005-06-24 12:38:35 +00:00
hackykid
a1d81b3558
(svn r2469) - Add: When removing tracks with the 'remove' tool, have it automatically remove signals on the tracks.
2005-06-21 19:45:05 +00:00
hackykid
c6845d2f38
(svn r2460) - Fix: Prevent assertion failure when trying to drag signals starting from a non-rail tile.
...
- CodeChange: Remove unused variable in CmdSignalTrackHelper.
2005-06-19 11:56:07 +00:00
tron
663e45eb57
(svn r2452) Fix defect in r2448 which caused building tracks unexpectedly fail or succeed
2005-06-17 07:35:10 +00:00
matthijs
1876744744
(svn r2448) General cleanup of rail related code, more to follow.
...
* Add: rail.[ch] for rail-related enums and wrapper functions.
* Codechange: Removed dozens of magic numbers with below enums.
* Codechange: Rewrote CheckTrackCombination().
* Add: TILE_SIZE, TILE_PIXELS and TILE_HEIGHT constants.
* Add: enums RailTileType, RailTileSubtype, SignalType to mask against the map arrays.
* Add: enums Track, TrackBits, Trackdir, TrackdirBits for railway track data. (Note that the old RAIL_BIT constants are replaced by TRACK_BIT ones).
* Add: enums Direction and DiagDirection
* Codechange: Moved a bunch of track(dir) related lookup arrays from npf.[ch] to rail.[ch].
* Codechange: move RailType enum from tile.h to rail.h.
* Add: Wrapper functions for masking signal status in the map arrays: SignalAlongTrackdir, SignalAgainstTrackdir and SignalOnTrack.
* Add: Wrapper functions to access rail tiles, using above enums
* Add: Wrapper functions to modify tracks, trackdirs, directions, etc.
* Add: Wrapper functions for all lookup arrays in rail.[ch] (Arrays are still used in parts of the code)
* Codechange: Renamed some variables and arguments to better represent what they contain (railbit -> track, bits -> trackdirbits, etc.).
* Codechange: Don't use FindLandscapeHeight() in CmdRemoveSingleRail(), since it returns way too much info. Use GetTileSlope() instead.
* Codechange: [NPF] Removed some unused globals and code from npf.c.
2005-06-16 18:04:02 +00:00
tron
aab5561c55
(svn r2434) Fix some defects in r2433
2005-06-08 09:03:29 +00:00
Darkvater
c37cf285ce
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
2005-06-07 21:37:00 +00:00
hackykid
daae0d315a
(svn r2428) - Feature: [newgrf] Implement shorter train vehicles (Therax), and the callback that goes with it.
...
- Codechange: Remove some magic numbers (PALETTE_CRASH)
2005-06-06 22:44:11 +00:00
tron
24fd817420
(svn r2409) Missed one _map_owner -> IsTileOwner()
2005-06-04 12:14:51 +00:00
