Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-06 03:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,359 Commits 12 Branches 179 Tags 452 MiB
f0e00996e0
Commit Graph

285 Commits

Author SHA1 Message Date
peter1138
100cc6fea7 (svn r4471) - Pools: Add a facility for calling a custom function during pool block clean up. 2006-04-18 18:48:50 +00:00
celestar
277f8cbda2 (svn r4466) -Fix: (FS#71) Game no longer crashes when the last vehicle serving a station has been deleted. 
-Negative side effect: upon loading old games, stations whose last vehicle was a station have (temporarily) lower ratings.
   -Positive side effect: station.h no longer includes vehicle.h (breaks the station.h->vehicle.h->rail.h chain)
 2006-04-18 08:50:17 +00:00
peter1138
49160bde23 (svn r4462) - Newstations: ensure the chosen tile layout is available from a custom station 2006-04-17 19:26:18 +00:00
peter1138
7331bfd36a (svn r4460) - Newstations: remove unused class_id / stat_id variables from the 
Station struct.
 2006-04-17 18:47:50 +00:00
peter1138
f52f3fa55d (svn r4450) - NewStations, rename *CustomStationSprite() to *CustomStationSpecIndex() to reflect their use, and alter the test for determining if a station has customised graphics. 2006-04-16 17:29:37 +00:00
belugas
6ac73b104e (svn r4426) Code Cleaning : replacing tabs with spaces, removing obvious comments, aligning arrays etc... 2006-04-15 03:08:14 +00:00
belugas
ccfeb13047 (svn r4425) Fix bug introduced in r4411 : while IS_BYTE_INSIDE, max value is STRICKLY LESS THEN. This caused airports animations to stay unanimated. Industries were similarly affected. 
Thanks to Richk67 for finding it.
Also, more Gfx define and use.
 2006-04-15 01:06:53 +00:00
belugas
c09109cc67 (svn r4411) CodeChange : Define and use some Gfx for both stations and industries. More are still to come 
Also, a bit of code cleaning, as pointed by Tron
 2006-04-14 01:54:07 +00:00
belugas
e09b87f56e (svn r4403) CodeChange : Add GetStationGfx and make use of [G|S]etStationGfx accessors. Also, use GetStationGfx instead of directly accessing the map for functions in station_map.h 2006-04-12 20:01:52 +00:00
peter1138
7b6e932d82 (svn r4383) - Codechange: Remove extraneous code from 4354; no need to get RailTypeInfo when we already have it... 2006-04-12 12:33:21 +00:00
belugas
6f708b2efe (svn r4367) CodeChange : Remove another direct map access in station_cmd.c. Replace an array of TileIndexDiffC by a use of loop with TileDiffXY. Thanks to Rubidium 2006-04-11 22:09:21 +00:00
peter1138
b87b68842a (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
35e93e451f (svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex 
Remove DoCommandByTile(), because now it does the same as DoCommand()
 2006-04-10 07:15:58 +00:00
tron
25366909ae (svn r4331) Replace some direction calculation magic with DiagDirection to make a bit more clear what's going on 2006-04-09 08:25:43 +00:00
tron
78a74a94a6 (svn r4325) When updating the vehicle count for road stops after load use the slot pointer of the vehicle instead of recalculating the road stop using the destination tile of the vehicle. Apart from being more simple this could prevent a inconsistency of slot information in the edge case when the destination tile isn't the tile of the assigned slot. 2006-04-08 13:58:19 +00:00
tron
a0e471a025 (svn r4324) Remove the unused road stop type attribute from struct RoadStop 2006-04-08 13:50:01 +00:00
tron
d3f3f9ff3c (svn r4323) -Regression: Clear the slot assignments of all vehicles heading twoards a road stop if that road stop gets removed 
This issue was fixed in r2210 and reintroduced in r4259 when the multistop handling was overhauled.
 2006-04-08 13:32:38 +00:00
celestar
a12466403b (svn r4320) -Fix/Codechange: rs->num_vehicles is no longer saved or loaded, but computed on the fly. Partly fixes FS#101 2006-04-08 05:44:37 +00:00
celestar
75fa1601f2 (svn r4319) -Codechange: Station map accessors 2006-04-08 05:24:29 +00:00
celestar
59c8408ccf (svn r4316) -Codechange: finished r4257 (forgot one variable there) 2006-04-07 09:37:04 +00:00
Darkvater
b02fc3b62b (svn r4265) - Fix: compile warning on VS2005 (parameter 2 different from declaration) 2006-04-03 18:11:42 +00:00
celestar
8cbe98a3fd (svn r4259) -[multistop] Fix/Feature/Codechange: 
1) Improved the road vehicle allocation (aka slotting) for multistop. Stops can now accept unlimited, er... 256, vehicles.
2) Removed the "wait for stop" feature, because it did not work in practise.
3) Slotting now ignores unreachable stations. Uses NPF at the moment because the old pathfinder cannot do it (yet)
4) Now matter how many vehicles approach a station, they will always be distributed evenly over existing stops.
5) Hopefully the last fundamental change to multistop
 2006-04-03 14:25:32 +00:00
celestar
c6aac81a9d (svn r4257) -Codechange: Renamed the airport_map5_tiles_* variables into airport_sections_* 2006-04-03 13:02:33 +00:00
celestar
69e1c716e8 (svn r4249) -Codechange: Replace more occurences of 16 by TILE_SIZE and of 8 by TILE_HEIGHT. Reverted one change from the previous commit because it was faulty 2006-04-03 09:07:21 +00:00
tron
7163a64c25 (svn r4242) Pass TileIndex and slope to GetSlopeTileh_*() instead of TileInfo 2006-04-02 12:49:18 +00:00
celestar
45f65b1788 (svn r4173) -Codechange: Use IsClearWaterTile for buoy construction 2006-03-30 12:00:35 +00:00
belugas
1cadf4ea53 (svn r4157) CodeChange : Keep on cleaning up Celestar's elrail merge 2006-03-29 20:35:39 +00:00
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. 2006-03-29 16:30:26 +00:00
Darkvater
e91fa54a15 (svn r4128) - CodeChange: Add proper semantics for CargoID for such variables instead of using the general byte-type. 2006-03-26 22:23:32 +00:00
celestar
9b3b545259 (svn r4113) Moved all relevant map functions for stations to station_map.[ch] 
Some work with animated tiles remains. Thanks to Tron for parts of the code and lots of proof-reading and suggesting
 2006-03-26 14:41:39 +00:00
tron
d0a445db41 (svn r4111) Fix/Remove some stale comments 2006-03-26 11:08:44 +00:00
tron
f6285a659c (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
tron
4d3364d811 (svn r3996) -Fix: Slope and height information returned for some tile types is wrong 
This leads to graphical glitches when drawing foundations.
This doesn't fix all problems, but at least some of them.
 2006-03-21 20:02:05 +00:00
celestar
480ea7c671 (svn r3939) -Fix: No longer assume that the number of slots is 2. It was not a problem up to now, but it's not The Right Thing (TM) to do either 2006-03-18 08:00:27 +00:00
tron
7b1c7c31fb (svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}() 2006-03-17 10:10:31 +00:00
Darkvater
650b1b0c93 (svn r3895) - Add proper SLE(G)_CONDNULL macros for the empty space reservation in savegames and update where used 
- Also add this capability to settings
 2006-03-16 00:20:33 +00:00
tron
7a0071cc53 (svn r3829) Reduce the use of _error_message by directly returning error codes instead of using this global variable 2006-03-12 12:19:25 +00:00
tron
ab9af3b05d (svn r3787) Use DirToDiagDir() instead of >> 1 2006-03-08 08:28:48 +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
celestar
db4777c818 (svn r3730) Multistop modifications: 
-Codechange: Completely rewritten the slot assignment system. It now consumes less CPU cycles and memory
-Codechange: Increased maximum number of roadstops to 16.
-Fix: Several conditions where a slot becomes unliked from a vehicle
-Codechange: ClearSlot now only takes one parameter, the vehicle
-Feature: Console command 'clearslots' to clear ALL currently assinged slots. debug usage only
-Feature: vehicles that cannot get a slot now wait on the road instead of planlessly blocking stops or circling around
-Codechange: Adjusted debug levels
TODO: Make the slot finder compatible with (a) pathfinder(s).
 2006-03-02 08:55:12 +00:00
tron
116fb6dff6 (svn r3714) Add functions to turn tiles into water and shore tiles 2006-03-01 21:00:44 +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
b8b6084da2 (svn r3644) Don't use FindLandscapeHeightByTile() when it's overkill - often it was just a complicated way of writing GetTileSlope(tile, NULL) 2006-02-21 07:41:54 +00:00
Darkvater
bf27f0c77b (svn r3627) - Change all hardcoded 255 max-saveload versions with the define SL_MAX_VERSION 2006-02-20 19:43:26 +00:00
tron
7692556c62 (svn r3613) Some more const, indentation, whitespace and similar stuff 2006-02-18 14:41:24 +00:00
peter1138
95ce125633 (svn r3612) - RoadStop->slot[] stores a vehicle index. Adjust its type and use INVALID_VEHICLE instead of nonsense INVALID_SLOT. 2006-02-18 14:11:23 +00:00
tron
d9a5483d1a (svn r3582) Restructure MoveGoodsToStation() to avoid double bookkeeping of StationIDs and station pointers 2006-02-09 06:33:37 +00:00
tron
d0a84a4cb9 (svn r3581) Just noticed the indentation was totally off, fix it 2006-02-09 06:24:53 +00:00
tron
0a7b664ae5 (svn r3580) Some small cleanups before the real change, especially reduce the indentation by one by using continue 2006-02-09 06:15:12 +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
peter1138
a3c14182d3 (svn r3530) - NewGRF: Move station resolver to newgrf_station 2006-02-03 23:02:01 +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
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
peter1138
d639318abd (svn r3372) - Fix: update signal states when building or removing rail station blocks 2006-01-06 17:45:43 +00:00
tron
318fe153eb (svn r3365) Staticise 36 functions 2006-01-05 12:40:50 +00:00
tron
ed4b89ee36 (svn r3353) Simplify the automatic length adjustment algorithm for replacing trains: Use the length of the train before the replacement as reference length 2005-12-29 12:42:59 +00:00
truelight
a980ddc219 (svn r3341) -Codechange: make mingw32 happy, and renamed Rectangle, because it already exists on that platform 2005-12-25 15:05:59 +00:00
tron
d5aa95b87e (svn r3313) Remove GPMI related changes from trunk 
Revisions in detail: 2542, 3226 (partial), 3229, 3231, 3232, 3238, 3242-3245, 3251, 3253, 3260, 3263, 3265, 3266, 3269, 3277, 3278, 3279, 3283 (partial), 3304, 3305, 3306
 2005-12-18 12:10:46 +00:00
truelight
6ca528ec82 (svn r3305) -Rename: Changed all instances of ottd_ related to the AI to ttai_ 2005-12-14 15:54:23 +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
truelight
8315736569 (svn r3232) -Add: implemented the event-system for AIs 
-Add: added several hooks (event-callbacks) for road-related-stuff
 2005-11-23 15:08:29 +00:00
truelight
898bb915ac (svn r3227) -Codechange: [Savegame] removed 'minor' version, and renamed 'major' version to just: version. 2005-11-22 19:33:29 +00:00
bjarni
16e65960b9 (svn r3218) -Feature: Multiheaded train engines will now stay in the same train 
This means that any user attempt to remove a rear engine will tell the user to move the front engine instead
	This fixes the assert when moving multiheaded engines (introduced in r3144)
	Note: to make old savegames use this feature, some engines might be turned around in order to link engines in pairs

-Codechange: train subtype is now a bitmask
	This allows fast access to info like if it is a wagon or engine and if it is in front and so on
	Note: savegame version bump
 2005-11-18 23:41:03 +00:00
peter1138
2a9d325930 (svn r3213) - Codechange: Clean up handling of road stops, avoiding unnecessary use of pointers and using the *BIT() macros. 2005-11-17 10:12:21 +00:00
tron
3c0179dd07 (svn r3202) If cascade -> switch 2005-11-16 12:29:37 +00:00
tron
8a3587fa28 (svn r3185) const 2005-11-15 09:00:02 +00:00
tron
84a16a0b30 (svn r3184) GB/SB 2005-11-15 08:49:46 +00:00
tron
0e075e271e (svn r3182) Fix braino in r3181 2005-11-14 20:20:24 +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
tron
81e5b16d71 (svn r3172) static, const 2005-11-13 13:43:55 +00:00
peter1138
12009af1c5 (svn r3167) - NewGRF: Start moving custom station code to separate files. 
Rewrite handling of station classes.
          Allow for more than 8 station tile layouts.
          Start of code to unload custom stations.
 2005-11-12 00:19:34 +00:00
peter1138
ce9f2fe823 (svn r3166) Constify read-only accesses of custom stations 2005-11-11 20:34:16 +00:00
bjarni
df6c48fdba (svn r3155) -Feature: [autoreplace] autoreplace can now remove cars from too long trains 
-Trains will now remember the length of stations it visits and sell cars
        when being autoreplaced if they became too long
        -If it needs to remove cars, then it starts from the front and sells
        all it can find until the train is short enough
        -This only works for trains, that knows the station length of the route
        so a full uninterrupted run is needed
        -a train needs 1-2 runs to detect if the shortest station is expanded
        -This feature can be turned on and off in the train replace window
        and each company can have it's own setting
        -NOTE: minor savegame version bump
 2005-11-07 23:20:47 +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
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
53a4a6a0f4 (svn r3046) Replace some numbers with sprite names and fix a typo in the sprite list 2005-10-15 11:06:54 +00:00
tron
f556128dde (svn r3030) More work for GB/SB, this time concerning the waiting_acceptance attribute of stations 2005-10-11 13:54:21 +00:00
tron
7ab7d79190 (svn r3028) s/255/OWNER_SPECTATOR/ 2005-10-10 10:36:37 +00:00
tron
8980891b09 (svn r3024) -Codechange: Another batch of replacements of int/uint/int16/byte/-1 with proper types and constants 2005-10-07 07:35:15 +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
4879e04986 (svn r3015) -NewGRF: Add a new sprite group result type, and support loading of callbacks results within random and "real" groups. (Not fully supported yet.) 2005-10-04 20:38:26 +00:00
peter1138
e8bca26b74 (svn r3014) -NewGRF, Codechange: Make all sprite group references be pointers instead of copying the data around. 2005-10-04 19:52:26 +00:00
tron
90e33aed22 (svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate 2005-09-28 19:35:36 +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
3907e46939 (svn r2953) - Fix: [ 1257766 ] Cannot make ships go to an oil platform (oilrig has no station). While it is still possible that oilrigs end up without a station, it is only the case where no more stations can be built at all 2005-09-14 22:03:27 +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
truelight
6145b99c22 (svn r2921) -Codechange: moved all AI-code to 1 central place (ai/ai.c) 
-Fix: removed the ability for the oldAI to cheat (this will criple him somewhat)
-Add: base-code for many improvements to come in the AI-system
-Add: added base-code for multiplayer AIs (DOES NOT WORK YET!)
 2005-09-07 15:10:11 +00:00
tron
486cffd2ad (svn r2819) Make variables, which are exclusive for internal use of the save/load code, static in saveload.c 2005-08-06 17:40:21 +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
celestar
692b226bb6 (svn r2731) -Fix [ 1244171 ]: Hangar orders are now properly invalidated as soon as the airport is removed 2005-07-28 05:47:54 +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