Commit Graph

275 Commits (7273d73ee9e7de23e9b9001e6817aa4a5680601c)

Author SHA1 Message Date
smatz b18b7f6f22 (svn r11819) -Fix: do not access the Vehicle struct that has been already deleted when removing crashed train 17 years ago
rubidium 2fc62eab05 (svn r11818) -Codechange: split player.h into smaller pieces. 17 years ago
smatz fa1f94e599 (svn r11812) -Codechange: introduce TrainExitDir() to simplify some functions 17 years ago
smatz bc4ed3eafd (svn r11802) -Fix [FS#716]: do not crash trains when leaving depot to a very long track
-Codechange: use dedicated pathfinder for signal updating, resulting in better performance and possible future improvements
17 years ago
rubidium 2d2e1e3863 (svn r11800) -Codechange: move some functions to a more logical location + some type safety. 17 years ago
rubidium 0365c1f33b (svn r11793) -Codechange: pass the expense type via the CommandCost instead of a global variable. Patch by Noldo (FS#1114). 17 years ago
peter1138 0ae26a0312 (svn r11789) -Codechange: coding style for global variable names 17 years ago
rubidium 64d691bacc (svn r11787) -Codechange: more header rewrites. This time related to viewport.h. 17 years ago
rubidium e2f7ec1d3e (svn r11775) -Codechange: move all autoreplace/autorenew functions to a single location. 17 years ago
rubidium 444e77d8bc (svn r11774) -Change: do not include variables.h in a header when it is not needed. 17 years ago
smatz f02cf9281b (svn r11760) -Codechange: unify the way how other end of a tunnel/bridge is determined at some places
-Fix: adding road/tram to tram/road bridge was cheaper by one tile
17 years ago
peter1138 5c23778065 (svn r11741) -Feature: Add support for NewGRF's train 'tilt' flag. Trains with tilt capability (specific details are per NewGRF set) will be given a 20% speed limit bonus on curves. 17 years ago
peter1138 c96fcfc21b (svn r11738) -Codechange: Refactor realistic acceleration's curve counting to use DirDiffs instead of local tables, and remove an unnecessary loop. 17 years ago
peter1138 e5f50b6fde (svn r11733) -Fix: Max speed for entering stations overrode the max speed of curves 17 years ago
peter1138 a1b482973d (svn r11732) -Fix (r4150): elrail merge gave elrail, monorail & maglev unintended speed bonuses for curves, as the bonus was based on the railtype index. The bonus is now specified by a property of the railtype. 17 years ago
peter1138 2194b15fdd (svn r11731) -Fix [FS#1582]: Clear sprite override data before performing NewGRF wagon attach callback. This stopped
the callback working for autoreplace and when moving wagons from train to train in a depot.
-Fix (r11724): Don't check wagon attach callback for the chain when moving a single wagon.
17 years ago
rubidium fe71089b0e (svn r11724) -Fix: make it impossible (for users) to circumvent the length checking of the NewGRF 'allow wagon attach' callback by moving several wagons at a time. 17 years ago
rubidium 445a733eb6 (svn r11719) -Codechange: split sound.h in a header with types and one with functions. 17 years ago
smatz c10d3da133 (svn r11707) -Fix: do not allow refitting flooded (destroyed) vehicles 17 years ago
rubidium 722613f7f3 (svn r11706) -Codechange: split vehicle.h and remove another bunch of useless includes. 17 years ago
smatz ae3206cd97 (svn r11705) -Fix [FS#1557]: trains could have sprites with wrong direction when reversing, also was inconsistent with save/load process (possible desyncs) 17 years ago
rubidium db73addb43 (svn r11702) -Codechange: move all date related stuff to date*. 17 years ago
rubidium f82aeb82c5 (svn r11701) -Codechange: removal unnecessary inclusions of map.h (and split map.h). 17 years ago
rubidium 81bf9f8503 (svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h' 17 years ago
rubidium 3074bca136 (svn r11680) -Codechange: refactor more out of openttd.h and functions.h. 17 years ago
rubidium 766551b0bc (svn r11677) -Codechange: move price and command related types/functions to their respective places. 17 years ago
rubidium 8427b8bad2 (svn r11675) -Codechange: split the string types from the string functions. 17 years ago
rubidium be923601bf (svn r11669) -Codechange: refactor tile.h -> tile_type.h and tile_map.h 17 years ago
rubidium 0995194162 (svn r11661) -Codechange: some header reworks in order to try to reduce the compile time of OpenTTD by reduce the amount of circular-ish dependencies. 17 years ago
smatz d56a690ba4 (svn r11649) -Codechange: some code can be simplified thanks to changes in r11642 17 years ago
smatz 926fe5c9e9 (svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h 17 years ago
smatz 60f9bbd17e (svn r11642) -Codechange: VehicleFromPos does check for v->tile == tile, so remove useless checks 17 years ago
smatz 57a83e7c76 (svn r11634) -Fix: update signals when deleting crashed train on a bridge, update even when train is rotated 17 years ago
smatz d31506654c (svn r11633) -Codechange: merge CheckTunnelEmpty and IsVehicleOnBridge into GetVehicleTunnelBridge 17 years ago
smatz cd58045234 (svn r11623) -Fix [FS#1533] (r11619): assert when train is going over two crossings next to each other 17 years ago
smatz 3a62919ba3 (svn r11619) -Fix [FS#1531]: do not make crossing red behind depot the train is entering 17 years ago
glx 06c131b244 (svn r11567) -Fix [FS#1512] (r11011): break the chain before moving a vehicle after another in the same chain 17 years ago
skidd13 e36dba227b (svn r11523) -Codechange: Move the CHANCE macros to core/random_func.cpp cause they depend on Random()
-Codechange: Convert the CHANCE macros to functions and rename them fitting to the naming style
17 years ago
skidd13 f92f3aec06 (svn r11485) -Codechange: Remove the doubled function ToggleBitT and rename the remaining to fit with the naming style 17 years ago
skidd13 3ae50673a3 (svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style 17 years ago
skidd13 6801cceda1 (svn r11482) -Codechange: Remove the doubled function ClrBitT and rename the remaining to fit with the naming style 17 years ago
skidd13 c0a2c0c23e (svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style 17 years ago
skidd13 f4a5c80d71 (svn r11476) -Codechange: rename the function myabs to abs to get rid of an unneeded define 17 years ago
skidd13 98f66552be (svn r11475) -Codechange: rename clamp and clampu to Clamp and ClampU to fit with the coding style 17 years ago
glx 9fcf6e7a43 (svn r11431) -Codechange: [NewGRF] Add support for changing rail vehicle user-defined bit mask (prop 25) via callback 36 17 years ago
truelight b935a74782 (svn r11383) -Codechange: fixed all the mess around KillFirstBit (tnx to Rubidium and skidd13) 17 years ago
glx 6120d02751 (svn r11352) -Codechange: cache callback 2D result (vehicle color mapping) instead calling it every time the vehicle is drawn 17 years ago
maedhros 5712da734f (svn r11333) -Fix: Train engines still had a value of 0. 17 years ago
rubidium b4e7203b0a (svn r11332) -Fix: vehicles getting a value of 0 on construction.
-Fix: assertion when selling vehicles.
17 years ago
rubidium c8df832678 (svn r11230) -Fix [FS#1228]: one could construct trains out of crashed wagons and engines. Based on a patch by SmatZ. 17 years ago
rubidium 2e8f93a821 (svn r11229) -Fix [FS#1307]: one could sell vehicles that were crashed in a depot, which would still yield money. 17 years ago
rubidium a28b307c95 (svn r11173) -Codechange: rename some callback enums so they are more uniform. 17 years ago
rubidium 26310769dd (svn r11134) -Fix [FS#1238]: vehicles got removed twice from the group list when selling whole trains. 17 years ago
rubidium f41c8ab3aa (svn r11122) -Fix [FS#1234]: crash when building a NewGRF vehicle when the articulated build vehicle callback returneed a different value for the purchase window than the normal build. Thanks for Dalestan and _minime_ for pointers to possible causes. 17 years ago
rubidium a18f3f25a9 (svn r11120) -Codechange: remove the arbitrary limit of 10 articulated parts for a vehicle. 17 years ago
rubidium d651f6b9ed (svn r11086) -Fix/Revert (r11053, r10984): "fixing" r11053 made the acceleration code use the wrong speed, which can be fixed by reverting a small piece of r10984. 17 years ago
rubidium 634aba16a7 (svn r11072) -Fix [FS#1045]: when a vehicle had a service order, the goto-depot button did not make it possible to stop the vehicle at that depot. 17 years ago
rubidium c97804461e (svn r11059) -Fix [FS#1182]: inconsistency between Rail<->ElRail conversions of different kinds of rail containing tiles (normal rail, stations, depots, etc). Patch by SmatZ. 17 years ago
rubidium 0db524e175 (svn r11048) -Fix [FS#1206]: several cases where (re)moving eninges on a train would corrupt the vehicle counts for the groups. 17 years ago
bjarni 7cd2aeb1c9 (svn r11045) -Codechange: added a function to tell if a vehicle is the rear part of a dualheaded train engine 17 years ago
rubidium cadc470da5 (svn r11017) -Codechange: unify determining whether a vehicle needs/can be service a little more. 17 years ago
rubidium 732845440a (svn r11011) -Fix [FS#1129]: GetFirstVehicleInChain did change the game state while being marked const.
-Codechange: do not brute force determine the first vehicle in the chain or previous vehicle, but do it by properly accounting the previous and first pointers when updating the next pointer. This gives a performance increase of about 15% when there are a lot of vehicles in the game.
17 years ago
rubidium f830699971 (svn r11004) -Codechange: some reworks of the saveload mechanism to be able to save and load private and protected variables in the vehicle struct. 17 years ago
rubidium 235ad4ab6b (svn r11003) -Codechange: replace Vehicle->next to Vehicle->Next() and Vehicle->SetNext() so we can trap instances that change a next pointer and (in the future) update the first/previous pointers based on that. 17 years ago
rubidium dc80195754 (svn r10999) -Codechange: unify the way the running cost of a vehicle is determined. Patch by nycom. 17 years ago
rubidium a6a9968d16 (svn r10997) -Codechange: unify the vehicle view window. Patch by PhilSophus. 17 years ago
rubidium 91d18ebd17 (svn r10984) -Codechange: unify the way one can get the current speed in the same forwat so we can display it. 17 years ago
rubidium 39f17c9de4 (svn r10983) -Codechange: use vehstatus & VS_CRASHED instead of some other "methods" custom to each vehicle to determine whether the vehicle is crashed. 17 years ago
bjarni 495bc4ecf4 (svn r10823) -Fix r8610 [FS#1097]: the autoreplace window vehicle count didn't always update correctly) (Matthias) 17 years ago
rubidium b21f29c38f (svn r10770) -Codechange: use the pool item class as super class for the vehicle struct.
-Codechange: do not force "special" vehicles to be allocated in the low 1024 vehicle slots and non "special" vehicles in the rest of the slots.
17 years ago
peter1138 9b9bca40b9 (svn r10734) -Fix [FS#1030]: Revert r10513) and add special cases for collision detection on bridges/tunnels. 17 years ago
rubidium a67957866a (svn r10697) -Codechange: give a more sensible names to some of the unkX variables. 17 years ago
rubidium df009178d4 (svn r10587) -Codechange: move the string/dparam related stuff from variables.h to strings.h 17 years ago
rubidium 7cb7488836 (svn r10493) -Codechange: update some callback ID enums to reflect their changed usage, add a few and update the comments. 17 years ago
rubidium 4b70a97fde (svn r10474) -Fix [FS#995]: wrong group count after train crash. 17 years ago
rubidium ec137f60ed (svn r10409) -Codechange: replace (Aircraft|RoadVeh|Ship|Train)_Tick with a Tick method in the Vehicle class. 17 years ago
rubidium c0e341ee05 (svn r10408) -Codechange: make GetImage a class method of Vehicle instead of Get(Aircraft|RoadVeh|Ship|Train)Image. 17 years ago
rubidium 5c1aff5ce6 (svn r10381) -Fix [FS#951]: skipping an order made train reverse immediatelly. Patch by boekabart. 17 years ago
peter1138 85fb4eb94b (svn r10363) -Fix [FS#911]: invalidating autoreplace windows didn't take account of vehicle group (Matthias Wolf) 17 years ago
peter1138 f8a5b61f4e (svn r10344) -Fix (r10317): confusion between TRACK_n and TRACK_BIT_n stopped NW/SE slopes being picked up, and compare middle of tile against current z, not previous. 17 years ago
maedhros 9fce70ac21 (svn r10335) -Fix (r10331): Increment the current order index *after* using it in UpdateVehicleTimetable. 17 years ago
rubidium e68892dcd4 (svn r10317) -Fix [FS#786]: acceleration not calculated properly when a train goes up a hill between tunnels. 17 years ago
truelight 872ba4e659 (svn r10288) -Fix [FS#202]: also age engines that aren't front-engines (based on a patch by kaan) 17 years ago
rubidium 37e3cbb980 (svn r10287) -Fix (r10266): some surprises from that (almost always) complaining compiler... 17 years ago
rubidium fc201d4ad8 (svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it. 17 years ago
rubidium d0fa4eb9de (svn r10258) -Codechange: as we are now using int64 all over the place, it's better to use int64 variables in the string generating too instead of packing them into two int32s.
-Fix: some displays of money were wrong.
17 years ago
rubidium 1b27095c83 (svn r10247) -Fix (r10210): *always* call SetDParamMoney when you want to place money in some string. 17 years ago
rubidium 0d8e82b7d7 (svn r10246) -Fix (r10297): some forgotten money conversions and truncation issues. Thanks to benc for providing the patch. 17 years ago
maedhros 7fb6e8f11d (svn r10236) -Feature: Introduce a form of timetabling for vehicles. 17 years ago
peter1138 195ef32835 (svn r10222) -Fix [FS#892]: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could cause desyncs in network games as the collision hash order is not guaranteed. (patch by B. N. Smatz) 17 years ago
rubidium 23727da96f (svn r10208) -Codechange: replace int32 with Money where appropriate. 17 years ago
rubidium 773a7c9cb6 (svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified. 17 years ago
rubidium 3ccc83e640 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate. 17 years ago
peter1138 70b6716b98 (svn r10177) -Fix: Passengers has one A and two Es (ln) 17 years ago
peter1138 ce590b59f3 (svn r10111) -Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles. (Based on work by 'B. N. SmatZ!' and 'madman2003') 17 years ago
maedhros c186f91cbd (svn r10097) -Feature: Add support for articulated road vehicles, or callbacks 11 and 17 for
road vehicles for those who prefer the technical explanation.
17 years ago
peter1138 2900732931 (svn r10028) -Fix (r2270/r2951): When deleting the first engine of a train with multiple engines, only reopen the train window if the player had the original train window open. This fixes 'random' windows opening for multiple players of the same company. 17 years ago
bjarni 9f13fc2cf5 (svn r10026) -Fix: unlinking a rail vehicle didn't clear the first pointer
After r9973, this could cause some asserts as some vehicles could end up with first pointers to chains they didn't belong to
17 years ago
maedhros 6777662286 (svn r10023) -Fix (r3218): When selling trains, if there were no wagons between multiheaded
engines the rear part could be checked despite having already been deleted,
triggering an assert.
17 years ago
maedhros 19250f91b0 (svn r10022) -Fix (r10007): Set the type of multiheaded trains before the subtype. 17 years ago
maedhros 2181e11c18 (svn r10008) -Codechange: Move a couple of functions related to articulated vehicles to a file of their own. 17 years ago
maedhros abdffa410d (svn r10007) -Codechange: Add some asserts to IsFrontEngine and friends to ensure that only trains use them. 17 years ago
rubidium fc9df2c336 (svn r9987) -Fix [FS#818]: a train under a bridge could collide with a train on the bridge. 17 years ago
bjarni 8aaa258122 (svn r9973) -Cleanup: removed some code that kept both ends of a dualheaded engine in the same train (when moving wagons in a depot)
NormaliseTrainConsist() is called later in the same command and it will take care of this issue
17 years ago
bjarni bcb668c2ff (svn r9967) -Fix (r9938): autoreplace would in certain conditions move dualheaded engines in a train (usually to the rear)
-Change: moving an engine in between the two ends of a dualheaded engine will now move the rear dualheaded engine to the front of the newly added engine (instead of moving the new engine to the rear of the rear dualheaded engine)
   This can make a difference if there are wagons in the train
17 years ago
rubidium 821e58ac95 (svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile. 17 years ago
peter1138 da204ca17f (svn r9875) -Fix (r9828): Only set carriage capacity if the wagon has not been refitted. 17 years ago
rubidium 8f0f090c51 (svn r9874) -Feature: advanced vehicle lists a.k.a. group interface. Now you can make groups of vehicles and perform all kinds of tasks on that given group. Original code by nycom and graphics by skidd13. 17 years ago
peter1138 e16ea9b758 (svn r9828) -Codechange: [NewGRF] Add support for changing cargo capacity with callback 36. This is set on construction for ships and roadvehicles, and whenever carriages are attached for trains. 17 years ago
peter1138 fe5830c4b7 (svn r9818) -Codechange: Cache wagon override sprite set whenever consist is changed, instead of 'recalculating' it every time it is used or just tested. 17 years ago
rubidium a84ca16dc4 (svn r9808) -Codechange: unify the Handle<VehicleType>Loading functions. 17 years ago
rubidium 2813b4440b (svn r9807) -Codechange: unify playing of sound when vehicle has been loaded and leaves the station. 17 years ago
peter1138 ebe81b98ce (svn r9806) -Codechange: [NewGRF] Add callback 36 support for purchase cost, for all vehicle types. 17 years ago
rubidium eecf806cfc (svn r9802) -Fix: a vehicle without visual effects isn't per definition unpowered (mart3p). 17 years ago
rubidium 6c967ddbfd (svn r9801) -Fix: do not assume that trains running on monorail/maglev cannot smoke/spark (mart3p). 17 years ago
rubidium 969366354d (svn r9800) -Codechange: play sound effects based on the engine class, not the rail type (mart3p). 17 years ago
rubidium 9a893ebe20 (svn r9794) -Codechange: refactor the question whether a vehicle can be loaded into LoadUnloadVehicle instead of duplicating it for each vehicle. 17 years ago
rubidium bc1901a6e4 (svn r9784) -Codechange: remove unused variable. 17 years ago
peter1138 93793eb89a (svn r9780) -Codechange: [NewGRF] Add support for variable vehicle weight for trains (callback 36, property 16) 17 years ago
rubidium cc9d811f53 (svn r9770) -Codechange: perform the payment of cargo when loading/unloading, but when arriving at the station. 17 years ago
rubidium 5a46c763f0 (svn r9760) -Codechange: remove the need for saving some vehicle variables. 17 years ago
rubidium 84c27fc773 (svn r9756) -Fix [FS#755]: LeaveStation wasn't always called when a station was left. 17 years ago
rubidium df59f5cd15 (svn r9755) -Codechange: refactor some more of the begin loading stuff. 17 years ago
rubidium 0def47a3b0 (svn r9754) -Codechange: make classes for all vehicle types, so we can make nicer/better maintainable code, i.e. virtual methods instead of switches. 17 years ago
rubidium dba21ab802 (svn r9752) -Codechange: remove some duplication related to BeginLoading. 17 years ago
maedhros 8acc58b731 (svn r9742) -Fix (r9689) [FS#739]: Fix cloning with refit costs again, hopefully for good this time. 17 years ago
maedhros aaa917d56d (svn r9685) -Fix (r9683): Call v->LeaveStation() when a vehicle in a station is sent to a depot. 17 years ago
rubidium 7577954ced (svn r9672) -Cleanup: lots of coding style fixes around operands. 17 years ago
peter1138 0d32783f87 (svn r9671) -Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static. Vehicle max speed and train power/te/running costs are adjustable. 17 years ago
belugas 0eaa72e324 (svn r9665) -Documentation: Doxygen corrections,errors, corrections of corrections... 17 years ago
maedhros 3d81de8d7e (svn r9609) -Codechange: Move some function prototypes out of functions.h and into landscape.h, and add a few where they didn't exist. 17 years ago
belugas 4c4f2a34ef (svn r9558) -Documentation: doxygen and comment changes: 'T' now. Almost done 17 years ago
maedhros 00d828e738 (svn r9543) -Fix [FS#691]: Split up STR_ENGINE_NOT_BUILDABLE into four strings so it can be
translated properly and remove "buildable", since it isn't actually a word.
17 years ago
belugas 691f8578fd (svn r9400) -Codechange: Use some more representative enum names for landscape types. 18 years ago
peter1138 5a2236dd84 (svn r9322) -Codechange: Use cargo class to count crash/flood victims 18 years ago
rubidium b63634f095 (svn r9277) -Fix [FS#685]: shared orders got messed up when the 'first' trains got removed in the depot. 18 years ago
peter1138 70e32d663a (svn r9259) -Codechange: NUM_CARGO isn't a valid cargo type... 18 years ago
KUDr 8a58bb5108 (svn r9146) -Fix [NTP][FS#676](r6800): "Train is lost" message is generated incorrectly. Forgot to set the best bird distance to zero in case we found the destination to indicate success. (de_zeurkous) 18 years ago
bjarni 0ad237611e (svn r9072) -Codechange: [Orders] added methods to orders to free them and check if they are in use 18 years ago
rubidium 36cea84b11 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). 18 years ago
rubidium 979ccd45ba (svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {}; 18 years ago
rubidium 4169bfba06 (svn r9050) -Codechange: Foo(void) -> Foo() 18 years ago
maedhros 78c3edcbb1 (svn r8946) -Feature: [NewGRF] Add support for vehicle variables 0xFE and 0xFF bit 10,
which is set when a vehicle was built during the exclusive testing phase.
18 years ago
maedhros 2f557f7dc0 (svn r8945) -Codechange: Rename v->load_status to v->vehicle_flags so it can be used for more than just the gradual loading status. 18 years ago
rubidium b5a997a446 (svn r8935) -Codechange: unification of track type between road and rail tiles, unification of ground type between normal rail tiles and depots/waypoints and removing the need for RailTileSubType. 18 years ago
tron 742f5d80b5 (svn r8900) -Fix
Get rid of DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits)
18 years ago
tron c0ec367e9b (svn r8899) -Fix
Remove the unused second parameter from GetTileRailType()
18 years ago
tron 05c6e8f883 (svn r8897) -Fix
Change the signature of GetNewVehiclePos():
-void GetNewVehiclePos(const Vehicle *v, GetNewVehiclePosResult *gp);
+GetNewVehiclePosResult GetNewVehiclePos(const Vehicle *v);
18 years ago
tron 270e366772 (svn r8896) -Fix
Most (i.e. 13 of 15) callers of GetNewVehiclePos() do not care for the return and the others can figure it out by inspecting the information returned in struct GetNewVehiclePosResult.
Therefore remove the return value.
18 years ago
tron 5d081ed350 (svn r8894) -Fix
Slightly simplify the control flow of TrainController()
18 years ago