Commit Graph

894 Commits

Author SHA1 Message Date
peter1138 7ce17c9577 (svn r9758) -Fix (FS#756): Ignore bit 1 (axis) of station tile layouts 2007-05-01 06:43:18 +00:00
rubidium fdf86bb4a2 (svn r9683) -Fix [FS#423]: improved loading does not use a huge amount of processing power anymore when having a lot of trains. 2007-04-20 08:00:30 +00:00
rubidium 80c259f64f (svn r9672) -Cleanup: lots of coding style fixes around operands. 2007-04-18 22:10:36 +00:00
belugas 4eb87ac62b (svn r9669) -Documentation: some more doxygen fixes 2007-04-18 18:00:33 +00:00
belugas d6651c1741 (svn r9665) -Documentation: Doxygen corrections,errors, corrections of corrections... 2007-04-18 00:41:09 +00:00
belugas addcae43fa (svn r9664) -Documentation: Doxygen corrections,errors and omissions 2007-04-17 21:09:38 +00:00
peter1138 49eb9b6fad (svn r9638) -Feature: Increase cargo types from 12 to 32 and enable newcargo flag in NewGRF loader. 2007-04-15 16:20:35 +00:00
maedhros ccaaa7d33a (svn r9609) -Codechange: Move some function prototypes out of functions.h and into landscape.h, and add a few where they didn't exist. 2007-04-12 13:07:15 +00:00
peter1138 a2cec54c9d (svn r9563) -Feature: Add more finer control to transparency options, including a new toolbar, accessible from the map menu or Ctrl X. Patch by Wolf01. 2007-04-05 07:49:04 +00:00
belugas dfe5533db6 (svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near 2007-04-04 01:35:16 +00:00
maedhros 9c88baee67 (svn r9532) -Fix (r8741) [FS#708]: Make errors when building drive through road stops more descriptive. 2007-03-31 09:53:40 +00:00
celestar a1ab0d29fe (svn r9524) -Fix(FS#640,r8755): Implemented a "dummy" State Machine for stations who got their airport removed while there were still aircraft within the State Machine (and thus caused asserts) 2007-03-29 13:52:34 +00:00
celestar 49ff7cb938 (svn r9425) -Codechange/Fix (FS#689): Housekeeping in the convert rail functions: Changed the order of error checks to generate more meaningful error messages, added some doxygen comments and replaced bitshifting by proper mathematical operations 2007-03-24 09:12:03 +00:00
belugas 06d3669bb5 (svn r9400) -Codechange: Use some more representative enum names for landscape types. 2007-03-22 03:42:43 +00:00
peter1138 d7f56f1550 (svn r9388) -Codechange: variable scope and type, and standardify all CargoID loops. 2007-03-21 13:19:01 +00:00
peter1138 e485b8f694 (svn r9301) -Codechange: Use cargo class to determine if a road vehicle can stop in bus or truck stops. 2007-03-18 22:07:44 +00:00
maedhros 33e84b2c1e (svn r9178) -Fix (r7573) [FS#679]: Don't allow building docks or buoys under bridges. 2007-03-14 12:56:09 +00:00
peter1138 4177215b41 (svn r9147) -Fix (r1770, r8161): when loadin games, enroute_from and enroute_from_xy were updated in the wrong place, causing issues with TTD savegames/scenarios. 2007-03-13 21:31:09 +00:00
rubidium d609dff2ba (svn r9076) -Fix [FS#529]: the intercontinental airport used 'T-junction' runway sprites when there is no exit in the middle of the runway as in the city airport (skidd13). 2007-03-09 10:12:08 +00:00
truelight 8877d11815 (svn r9070) -Fix [FS#404]: if bribe failed and you didn't pick up cargo yet, you wouldn't ever be able to do so for a given station 2007-03-08 20:50:27 +00:00
rubidium ce919e8c71 (svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code). 2007-03-08 16:27:54 +00:00
rubidium 24c4d5b06d (svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {}; 2007-03-07 12:11:48 +00:00
rubidium 36bb92ae24 (svn r9050) -Codechange: Foo(void) -> Foo() 2007-03-07 11:47:46 +00:00
belugas b71354dc40 (svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style. 2007-03-03 04:04:22 +00:00
richk d11e36e477 (svn r8978) -Feature: Rewrite of transfer system.
This major feature-fix keeps track of the value of transfers offloaded at a station, and hands on to a loading vehicle a credit note proportionate to the cargo loaded. The transferring vehicle is paid only for the distance it has travelled. eg. B-C in a transfer chain A-B-C-D.
When the final cargo is delivered, these credit notes are cashed, and the final vehicle is paid for A-D minus any credit notes it is carrying. The company bank balance increases by the value of the A-D route.
You still need to set up a profitable route; it is still easy to make a loss on transfers by bad planning. :)
2007-03-02 18:49:11 +00:00
tron d3b29bcacb (svn r8876) -Fix
Replace tests with magic numbers by a simple extraction template for command parameters
2007-02-24 09:42:39 +00:00
tron 1d1121f85a (svn r8875) -Fix
Remove unnecessary EnsureNoVehicle() checks because they are
- pointless per se (f.e. there are no vehicles on house tiles)
- done again (f.e. using CMD_LANDSCAPE_CLEAR just a few lines later)
2007-02-24 06:46:20 +00:00
belugas a723770836 (svn r8853) -Cleanup: doxygen changes. Correct forgotten c files to cpp files with the @file tag as well as a few general comments style 2007-02-23 01:48:53 +00:00
rubidium 202702c007 (svn r8852) -Fix (r8735): make the dynamite tool for drive through road stops as if it were removing a normal road tile (consider the local authority and such).
-Fix (r8735): remove drive through road stops on town owned roads when going bankrupt/being removed.
2007-02-23 00:17:46 +00:00
rubidium dcb217a6ac (svn r8851) -Fix [FS#643] (r8735): crash on removing town owned roads outside of the local authority. 2007-02-23 00:10:16 +00:00
tron 103d119c51 (svn r8841) -Fix
Remove {,u}intswap() and replace them by Swap()
2007-02-22 08:43:02 +00:00
tron f716c0b30f (svn r8833) -Fix
-Codechange: Split MakeRoadStop() into MakeRoadStop() and MakeDriveThroughRoadStop() for more clarity and less possibilities to use it incorrect
2007-02-21 19:46:37 +00:00
tron 565da62355 (svn r8828) -Fix
-Regression (r7585): On load calculate the station rectangle for all savegames, not just savegames with at least version 27
2007-02-21 07:37:31 +00:00
peter1138 ef2daa5060 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. 2007-02-20 22:09:21 +00:00
tron 41d526415c (svn r8822) -Fix
Variable scope, const
2007-02-20 06:39:09 +00:00
rubidium 168a7876a0 (svn r8809) -Fix (r8715): accidentally removed a part of an expression. 2007-02-19 13:45:13 +00:00
tron 352273a5b3 (svn r8800) -Fix
Simplify MoveGoodsToSation() under the assumption that 0 is less or equal than 0
2007-02-18 11:45:56 +00:00
tron 1ed8e7e04e (svn r8799) -Fix
Reduce variable scope
2007-02-18 11:27:09 +00:00
rubidium 0734bcfea0 (svn r8797) -Fix (8741): the 'drive through station built on town owned road' bit was not set. 2007-02-18 11:14:55 +00:00
tron 1a1129785a (svn r8796) -Fix
Remove the unused function AllocateStation() which was left over from r8125
2007-02-18 09:00:34 +00:00
tron c6743c5e11 (svn r8794) -Fix
Remove the possiblity to take over stations with OWNER_NONE by building a station next to it
-Fix: It was possible to take over buoys by building a station next to them
Also remove the now unnecessary special case which prevented taking over oilrigs
NOTE: 0.5 candidate
2007-02-18 08:37:39 +00:00
tron ea8eb50c0e (svn r8782) -Fix
Adapt GetClosestStationFromTile() more to the way it is used:
- All but deleted stations get filtered later, so do not include non-deleted station in the first place
- Remove the two parameters, which are the same for all callers
2007-02-17 15:59:33 +00:00
tron b6d2172678 (svn r8781) -Fix
A spectator cannot build stations, so do not include a special case for him
2007-02-17 15:34:05 +00:00
tron a74fad50fa (svn r8779) -Fix
-Codechange: Use a more generic test, which tests the allowed aircraft instead of hardcoding the airport type numbers, to generate station names
2007-02-17 15:03:30 +00:00
tron 8aacd2585d (svn r8767) -Fix
-Codechange: Do not hardcode the catchment radius of airports, but hold the information in AirportFTAClass
-Fix (r979): The default AI tested possible airport locations with a fixed catchment radius instead of the radius of the to be built airport
2007-02-17 07:45:18 +00:00
rubidium c04c8382ca (svn r8765) -Codechange: remove logic redundancy by moving it from the gui into the cmd code. 2007-02-16 22:44:56 +00:00
tron 87e03c7aa8 (svn r8755) -Fix
Abbreviate GetAirport(st->airport_type) to st->Airport()
2007-02-16 09:38:43 +00:00
rubidium 79dda0fa07 (svn r8741) -Fix (r8735): make the saveguards of CmdBuildRoadStop more robust and add roadstops.grf to the list of required grfs. 2007-02-14 20:58:19 +00:00
rubidium 0e8f006dc1 (svn r8735) -Feature: drive-through road stops made possible by the hard work of mart3p. 2007-02-14 16:37:16 +00:00
rubidium 154dff9873 (svn r8715) -Codechange/cleanup: replace magic numbers related to state of road vehicles with enums. Original patch by mart3p. 2007-02-13 22:27:27 +00:00
celestar d9385f2798 (svn r8709) -Fix/Codechange: Rename the function GetStationPlatforms into GetPlatformLength because that is what it really does. Overload it because there is already a GetPlatformLength (one gives the length of the whole platform, the other gives the remaining length in a given direction). Turned both functions into methods of Station. While messing around with it, fix a problem where loading times for overhanging trains are miscomputed. 2007-02-13 16:36:38 +00:00
celestar 8eab3964b4 (svn r8707) -Codechange: Turn IsValidStation into a method of Station 2007-02-13 15:42:52 +00:00
celestar 6f68ac46b8 (svn r8705) -Codechange: Increased the number of airport blocks to 64. This involves changing the enum of airport blocks to a static const uint64 as SOME platforms do not support 64-bit enums 2007-02-13 12:34:54 +00:00
rubidium a419f4aeda (svn r8698) -Codechange: enumify the returns of VehicleEnterTile 2007-02-13 10:26:53 +00:00
rubidium eab6dd9898 (svn r8694) -Codechange: make RoadStop's status accessible via accessor functions. 2007-02-13 00:25:42 +00:00
rubidium 6bbbedc8cc (svn r8635) -Fix: draw canal edges under buoys that are in a canal. 2007-02-08 14:04:02 +00:00
rubidium d95a872579 (svn r8619) -Fix: store the ownership of a water tile in the buoy tile and set the ownership of the water tile when the buoy is removed. This solves the issue of removing ownership from canal tiles thus making is possible for other players to remove the canal tile. 2007-02-07 17:52:21 +00:00
KUDr e66028538a (svn r8540) -Fix[YAPF]: Assert when buoy is placed on NE or NW map edge (Dan) 2007-02-02 20:20:56 +00:00
tron 4216c10eb1 (svn r8539) -Fix
static
2007-02-02 19:09:54 +00:00
tron be26fbcbb3 (svn r8531) -Fix
Remove unnecessary pointer mumbo-jumbo from FindRoadStopSpot()
2007-02-02 08:23:48 +00:00
celestar 90528dc78e (svn r8528) -Codechange: Rename IsBuoy_() to IsBuoy() now that the naming conflict no longer exists. 2007-02-02 07:48:06 +00:00
celestar 5678febfe2 (svn r8514) -Codechange: Turn IsBuoy into a method of stations 2007-02-01 16:48:38 +00:00
Darkvater 3c2cb4871e (svn r8507) -Codechange/Feature: Don't remove player-owned property on-load in the scenario editor. Add a button to the landscape window to do this. 2007-02-01 12:51:10 +00:00
tron 43242302e0 (svn r8499) -Fix
-Fix (?): When removing an oil rig replace the station tile by water, not bare land
2007-01-31 21:42:58 +00:00
tron fe1691acce (svn r8477) -Fix
-Codechange: Remove the unnecessary attributes Station::{bus,lorry}_tile_obsolete by replacing them with a scan of the map for existing road stops when loading old savegames
2007-01-31 06:25:46 +00:00
tron 6e20c73c33 (svn r8476) -Fix
Remove the unused remnants of {bus,truck}_stop_status_obsolete
(though I wonder a bit why this information doesn't get converted on load *shrug*)
2007-01-31 05:08:07 +00:00
tron 5d4241db30 (svn r8475) -Fix
Remove the unused remnants of blocked_months_obsolete
2007-01-31 05:01:29 +00:00
tron f5b41a2fbb (svn r8474) -Fix
Turn GetPrimaryRoadStop() into a method of struct Station
2007-01-31 04:34:56 +00:00
tron e3b63e6d83 (svn r8449) -Fix
-Codechange: Remove the superfluous attribute RoadStop::prev
2007-01-28 21:54:40 +00:00
KUDr 201ba1f5c3 (svn r8414) -Codechange: Use own AutoPtrT instead of std::auto_ptr.
-Simplifies assignment from raw pointers
 -Should be harder to crash the program by incorrect assignment into it.
 -Should help with MorphOS compilation errors
2007-01-26 11:38:07 +00:00
celestar 113fa175a4 (svn r8403) -Fix (r8402): Forgot to remove an enum 2007-01-25 11:11:43 +00:00
celestar b0a0086e7c (svn r8402) -Codechange: Move RoadStop-specific enums to the RoadStop class, and changed a one-member enum into a static const. Simplify their naming and add some doxygen-comments to RoadStop 2007-01-25 10:06:58 +00:00
tron e85cd647e1 (svn r8400) -Fix
Simplify r8399
2007-01-25 07:11:06 +00:00
glx 35de25eec1 (svn r8399) -Fix (r8185): a new road stop was always created in CmdBuildRoadStop(), but it was not deleted if DC_EXEC flag was not set or if the station creation failed 2007-01-25 01:29:24 +00:00
KUDr 147ca22060 (svn r8231) -Fix (r8125): MP desync caused by calling Random() from station constructor. This was wrong because station constructor is called also when loading savegame and when player tries to build station when it is not sure that it will succeed (thanks Rubidium) 2007-01-18 09:34:44 +00:00
tron 3be30b8842 (svn r8212) -Fix
Remove the unnecessary attribute RoadStop::used. The same information can be derived from RoadStop::xy
2007-01-17 22:32:34 +00:00
tron 3d1735fcfd (svn r8207) -Fix
Remove the write-only attribute RoadStop::station
2007-01-17 21:14:17 +00:00
peter1138 61f5cf9b6f (svn r8186) -Fix (FS#557): Apply railtype offset to station graphics if no custom station is in use. 2007-01-17 12:57:35 +00:00
celestar 8c54793068 (svn r8185) -Codechange: Equipped Roadstops with new/delete operators and gave them proper constructors/destructors (Thanks to KUDr for a nice interactive C++ lesson) 2007-01-17 11:15:51 +00:00
rubidium 3d6b021faa (svn r8161) -Fix (FS#555, r8144): enroute_from_xy was not set properly for old savegames. 2007-01-16 18:31:58 +00:00
peter1138 9b73684733 (svn r8153) -Codechange: Change UpdateStationAcceptance() and ShowRejectOrAcceptNews() to work with cargo IDs instead of cargo names, and explicitly list the different strings to use. 2007-01-16 11:13:00 +00:00
celestar 05b783e551 (svn r8144) -Fix: [FS#163] When a station is removed, vehicles do not get excessive payment any longer, as the origin TILE is now stored as long as the origin STATION for the transported cargos. Basically this is only a temporary fix until cargopackets are implemented, but it fixes one of the oldest known bugs (Special Thanks to Darkvater for lots of testing) 2007-01-15 14:42:24 +00:00
KUDr fd383668f8 (svn r8139) -Cleanup: simplify auto_ptr initialization (Tron) 2007-01-14 23:43:59 +00:00
rubidium 48611e1e20 (svn r8137) -Fix (FS#551, r4259, r4320): roadstop->num_vehicles was wrong for savegames with version 24 or lower and do not calculate roadstop->num_vehicles when reading the roadstops as the vehicles might not be loaded at that moment. 2007-01-14 23:09:25 +00:00
KUDr cd74706c54 (svn r8136) -Codechange: Station spread rectangle manipulators turned into StationRect::methods. 2007-01-14 23:02:12 +00:00
peter1138 92d418b031 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values.
This lets us increase the sprite width from 14 to up to 29 bits, 
effectively nulling the old sprite limit. Table changes in next commit.
2007-01-14 19:57:49 +00:00
KUDr 19d31c7417 (svn r8127) -Fix (r8125): removed redundant free() call which is also in Station destructor (Tron) 2007-01-14 19:44:27 +00:00
KUDr 1eac31a1d8 (svn r8126) -Fix (r8125): missing #include fixes compilation error on g++ (still some warnings, working on it) 2007-01-14 19:29:21 +00:00
KUDr 8b65342449 (svn r8125) -Codechange: Station is now constructed/destroyed using new/delete operators (don't worry, they still use the same memory pool). Few station related functions turned into Station::methods (just first step). All this new stuff moved from station_cmd.cpp to the new file (station.cpp). 2007-01-14 19:18:50 +00:00
peter1138 bfa618ef89 (svn r8120) -Fix (r8055): Station cargo waiting value clamp should be signed not unsigned. This resulted in cargo magically appearing... 2007-01-14 18:38:40 +00:00
KUDr 33be1ecfb1 (svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter 2007-01-11 17:29:39 +00:00
celestar 2ac0410767 (svn r8055) -Codechange: Replace the different max, dmax, maxu whatever macros by a simple template function max(), that requires two arguments of the same type. While I'm at it change a variable called "max" to "maxval" in a function that calls max(). 2007-01-11 11:05:01 +00:00
rubidium f35ed4bbc2 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. 2007-01-10 18:56:51 +00:00
KUDr e373ea7096 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) 2007-01-10 18:12:09 +00:00
Renamed from src/station_cmd.c (Browse further)