Commit Graph

373 Commits

Author SHA1 Message Date
alberth
66b3d60b60 (svn r20319) -Codechange: Align comments, add indent to a function call. 2010-08-02 20:37:32 +00:00
alberth
ccbacfc298 (svn r20318) -Doc: Doxygen additions. 2010-08-02 20:32:39 +00:00
alberth
6c01a5833c (svn r20317) -Codechange: Move variable declaration to their first use. 2010-08-02 20:19:10 +00:00
frosch
c18839704b (svn r20286) -Codechange: Unify end of doxygen comments. 2010-08-01 19:44:49 +00:00
frosch
5b86c79fce (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
alberth
e5b703ddf9 (svn r20279) -Doc: Doxygen additions/improvements. 2010-08-01 17:45:53 +00:00
alberth
1743c86610 (svn r20266) -Doc: Mostly typo fixes, a few doxygen-related improvements. 2010-07-31 21:02:56 +00:00
alberth
7d3de0632d (svn r20262) -Codechange: Remove unused ScoreInfo::id field, and doxyment the data structures. 2010-07-31 19:45:48 +00:00
alberth
137e2b64c9 (svn r20211) -Codechange: Indented code should have curly braces around it. 2010-07-24 10:14:39 +00:00
rubidium
1b507dcf66 (svn r20164) -Fix [FS#3870]: inconsistencies w.r.t. to km/h vs km-ish/h as "base" unit for aircraft speeds 2010-07-16 17:45:34 +00:00
frosch
a5bea603ea (svn r19931) -Fix (r19914): Convert assertion in Backup<> destructor into DEBUG() output. It was triggered on exceptions, especially when aborting world generation. 2010-06-05 12:16:12 +00:00
frosch
ee53807e51 (svn r19914) -Codechange: Wrap a helper class around temporary assignments of _current_company to ensure proper restoration. 2010-05-31 20:22:57 +00:00
frosch
a4413f4cf6 (svn r19670) -Codechange: Add CeilDiv() and RoundDiv() to simplify integer divisions with rounding. 2010-04-18 14:56:05 +00:00
frosch
001a96526c (svn r19655) -Codechange: Reduce usage magic p1 parameter. 2010-04-17 13:45:48 +00:00
smatz
abaf6b5b42 (svn r19651) -Fix [FS#3745]: when a company is sold, move connected clients to spectators 2010-04-17 11:39:46 +00:00
smatz
258b128a56 (svn r19614) -Codechange: "it's" => "its" where appropriate 2010-04-12 14:12:47 +00:00
rubidium
f91cf9e519 (svn r19277) -Fix [FS#3646]: [NewGRF] Ensure prices can't be set to zero. Zero prices break a lot of the internal logic to determine whether something has been done. 2010-02-27 16:27:28 +00:00
yexo
391b759d04 (svn r19197) -Codechange: introduce animation callbacks for airport tiles 2010-02-22 14:16:57 +00:00
rubidium
06e3ad23a0 (svn r18908) -Fix [FS#3561]: on bankruptcy the company value did include the loan and as such the value at which you bought the company was too low 2010-01-24 11:05:26 +00:00
rubidium
9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +00:00
rubidium
ad8d6e8dd2 (svn r18764) -Fix [FS#3422]: split the (un)load ticks counter and signal wait counter; sometimes they might get into eachother's way 2010-01-09 14:43:08 +00:00
rubidium
6cac8be361 (svn r18717) -Codechange: use TileArea in industry instead of three separate variables. Also make use of TileArea functions for determining the 'width' and 'height' of an industry. 2010-01-04 18:21:07 +00:00
rubidium
f99c8b3f21 (svn r18703) -Feature-ish: allow virtually paying a percentage of the leg profit in feeder chains. This to give the user a better chance to get a feeder system without "losses". 2010-01-03 21:29:20 +00:00
rubidium
3de085a143 (svn r18683) -Fix: it's not an other 2010-01-01 18:45:40 +00:00
frosch
9384da0ea2 (svn r18540) -Codechange: resulting in better name for 'result'. 2009-12-19 17:14:35 +00:00
frosch
ec8e44055c (svn r18537) -Fix (r17436): Also do not account cargo in statistics, if it was not accepted. 2009-12-19 15:51:55 +00:00
rubidium
da30e736ca (svn r18330) -Cleanup: remove some unneeded includes 2009-11-28 20:35:25 +00:00
frosch
f60a437d36 (svn r18268) -Feature: [NewGRF] Make price base multipliers related to vehicles only apply to the GRF locally, if it defines engines of that type itself. 2009-11-24 13:15:58 +00:00
frosch
fe65c7f833 (svn r18266) -Codechange: Add a function to compute prices from price base and cost factor and use it consistently for vehicle purchase, running cost, and refit cost. 2009-11-24 13:12:34 +00:00
frosch
c0936d100d (svn r18016) -Codechange: Move the arbitrary basecost multiplier offset (8) to newgrf loading and make the internal state zero-based instead. 2009-11-08 18:04:53 +00:00
frosch
d6e65fc173 (svn r18008) -Codechange: Rename NUM_PRICES to PR_END, and use the Price enum some more. 2009-11-08 12:23:02 +00:00
frosch
040404c5d3 (svn r18005) -Codechange: Convert the Prices struct into an array and an enum. 2009-11-07 22:47:54 +00:00
frosch
3cb949a17d (svn r17976) -Codechange: Move CargoClass to cargotype.h and clean up including of newgrf_cargo.h 2009-11-05 19:46:17 +00:00
rubidium
d4919d8e88 (svn r17834) -Fix [FS#3274] (r17808): you got paid a bit too much... ofcourse the index of the source station generally doesn't equal the location of said station. 2009-10-20 22:06:33 +00:00
rubidium
756f813040 (svn r17808) -Codechange: remove write 'access' from all of CargoPacket's variables 2009-10-18 17:53:34 +00:00
rubidium
e553983e39 (svn r17800) -Codechange: first steps into making CargoList a template 2009-10-18 14:28:26 +00:00
frosch
4cb5a3e8a2 (svn r17725) -Codechange: Reduce usage of EngInfo and XxxVehInfo, esp. when a Engine * is already present. 2009-10-06 19:17:07 +00:00
rubidium
ec3a0dc064 (svn r17720) -Codechange: guard the CargoPacket variables that are cached in CargoLists so they cannot be written from outside the CargoList class (based on patch by fonsinchen) 2009-10-06 17:23:15 +00:00
smatz
581366f352 (svn r17592) -Fix [FS#3212](r17436): force all cargo being accepted when industry tiles accept it but industry itself doesn't 2009-09-20 18:52:12 +00:00
smatz
c3a80f1518 (svn r17589) -Codechange: rename town_acc to always_accepted 2009-09-20 17:44:33 +00:00
rubidium
2e5596025c (svn r17579) -Fix: remove doxygen docs for removed parameters, or change @param to @tparam if necessary 2009-09-19 15:17:47 +00:00
rubidium
310465da07 (svn r17570) -Fix: a number of Doxygen warnings about missing parameters, which were sometimes missing and sometimes just typos 2009-09-19 09:51:14 +00:00
rubidium
06e490fadc (svn r17567) -Fix: some doxygen warnings 2009-09-18 14:23:58 +00:00
rubidium
4db98357ea (svn r17552) -Codechange: rename load_unload_time_rem to something more generic as it's used for more than just load/unload. Also add some documentation about where it is used. 2009-09-15 20:58:44 +00:00
rubidium
ba1af15b7a (svn r17551) -Fix [FS#3201] (r17222): vehicles waiting for their time table didn't load anymore after their initial load was completed 2009-09-15 20:13:47 +00:00
frosch
8f5622ebad (svn r17550) -Fix (r8973): Aircraft are good enough, don't make them even better. 2009-09-15 19:56:41 +00:00
rubidium
3325d91c6e (svn r17546) -Fix (r9617): sign extending of profit calculation didn't work 2009-09-15 17:23:24 +00:00
yexo
6fb7012bc6 (svn r17542) -Fix: don't access variables in the company struct after it has been deleted
-Cleanup: remove some never-used code
2009-09-14 22:09:50 +00:00
rubidium
c2c0f4403e (svn r17534) -Codechange: unify the naming of callback masks/flags 2009-09-14 12:22:57 +00:00
frosch
0e36260337 (svn r17532) -Codechange: Rename several Invalidate functions to SetDirty for more consistency and distinguishability. 2009-09-13 19:15:59 +00:00
rubidium
97d1314a47 (svn r17485) -Change [FS2459]: make the performance ratings harder to exploit; only count profitable vehicles and recently serviced stations. 2009-09-09 08:22:21 +00:00
rubidium
ab935f3085 (svn r17449) -Fix (r17436): MSVC compile warning about comparing signed and unsigned values 2009-09-07 10:00:14 +00:00
smatz
5d622fd840 (svn r17439) -Fix (r17436): you weren't paid for cargo delivered to houses and headquarters anymore 2009-09-07 07:39:08 +00:00
smatz
587ae07799 (svn r17437) -Change: don't accept cargo produced in the same industry (generalise and improve the check used only for valuables) 2009-09-06 22:05:53 +00:00
smatz
7c978ce5cd (svn r17436) -Change: pay only for cargo actually delivered, not for all cargo unloaded at station (can differ with 'stockpiling' industries) 2009-09-06 21:59:20 +00:00
frosch
d7bf8b74c7 (svn r17435) -Codechange: Move _cargo_payment_rates[] to CargoSpec::current_payment. 2009-09-06 20:36:17 +00:00
frosch
64f5f1d02c (svn r17433) -Codechange: Store cumulated inflation in savegame and compute all prices from that instead of storing all prices separately.
Note: Savegame conversion computes the inflation from max loan. Prices from modified savegames will get lost. TTO savegames will also behave slightly different.
-Change: NewGRF price modifiers now take effect everytime when loading NewGRFs instead of once on gamestart.
2009-09-06 18:53:57 +00:00
smatz
6572bce9c1 (svn r17426) -Fix (r1): economy recession would never end when economy is set to Steady while in recession 2009-09-05 19:02:34 +00:00
smatz
dc73d5432d (svn r17420) -Codechange: replace assert() by assert_compile() where possible 2009-09-04 23:02:52 +00:00
rubidium
62e990823d (svn r17345) -Fix [FS#2769]: one wasn't offered to take over bankrupt companies anymore; caused by the introduction NoAI, although NewAI had the same problem too. 2009-09-01 12:57:04 +00:00
rubidium
c1fe2ce4bc (svn r17343) -Codechange: it's bankruptcy, not bankrupcy, according to my Oxford Dictionary of English and Merriam-Webster. 2009-09-01 12:28:46 +00:00
rubidium
94867f3052 (svn r17342) -Fix: reset bankruptcy checks when bankruptcy has been averted and don't set an unused timeout with a magic number 2009-09-01 12:17:02 +00:00
rubidium
846cd79ada (svn r17341) -Fix: memory leak when trying to bankrupt the local company 2009-09-01 12:16:01 +00:00
smatz
09e1ecc8ac (svn r17316) -Codechange: use Industry::GetByTile() instead of GetIndustryByTile() 2009-08-30 11:47:41 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
2612f46a20 (svn r17222) -Fix [FS#3129, FS#3130]: with time tables vehicles would stay in the 'loading' state after they have finished loading 2009-08-19 15:27:55 +00:00
smatz
d59b687f65 (svn r17124) -Codechange: store subsidies in a pool (instead of an array) 2009-08-08 20:53:36 +00:00
smatz
0502a6df42 (svn r17113) -Change [FS#265][FS#2094][FS#2589]: apply the subsidy when subsidy's destination is in station's catchment area and cargo packets originate from subsidy's source
-Change [FS#1134]: subsidies aren't bound to stations after awarding anymore, they still apply to town or industry, no matter what station is used for loading and unloading. Awarded subsidies from older savegames are lost
-Change [NoAI]: due to these changes, AISubsidy::GetSource and AISubsidy::GetDestination now return STATION_INVALID for awarded subsidies
2009-08-08 16:42:55 +00:00
smatz
738d7fde53 (svn r17107) -Codechange: store type of subsidy source and destination in the Subsidy struct instead of determining it every time it's needed 2009-08-07 22:23:34 +00:00
smatz
fcae906575 (svn r17086) -Cleanup (r16654): remove code used only for debugging 2009-08-06 13:51:48 +00:00
rubidium
d61be2637e (svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives 2009-08-05 17:59:21 +00:00
belugas
00338562b9 (svn r17058) -Codechange: magic numbers removal.
Two values used intead of just one, as it gives more possibilities to those who dare...
2009-08-03 20:02:25 +00:00
frosch
29d4316064 (svn r17037) -Fix (r17036): 'Polygonal Capabilities' are a core feature of windows. 2009-08-02 13:56:14 +00:00
frosch
8b50754b19 (svn r17036) -Codechange: Split price bases from economy.cpp to table/pricebase.h. 2009-08-02 12:34:26 +00:00
rubidium
fb36ebd9dd (svn r16933) -Fix [FS#3054] (r16694): vehicles would wait "very long" when they had nothing to unload and gradual loading was disabled. 2009-07-24 00:08:48 +00:00
rubidium
6435dc89fe (svn r16912) -Codechange: split waypoint.h in waypoint_base.h and waypoint_func.h 2009-07-22 10:18:19 +00:00
rubidium
84dec43208 (svn r16901) -Fix [FS#3046] (rpbs): when marking trains stuck don't reset the unload counter/stuck when the vehicle is unloading. It'll be automatically reset once the vehicle wants to leave the station 2009-07-21 17:14:05 +00:00
smatz
3564579dc4 (svn r16877) -Codechange: use Subsidy::IsAwarded() instead of testing subsidy's age 2009-07-18 19:54:35 +00:00
smatz
cb13cf2543 (svn r16852) -Codechange: use FOR_ALL_CARGOSPECS for iterating over all valid CargoSpecs 2009-07-16 20:40:06 +00:00
smatz
8718babe90 (svn r16849) -Codechange: replace GetCargo() by CargoSpec::Get() 2009-07-16 19:00:13 +00:00
smatz
64de470917 (svn r16814) -Codechange: make IsNormalAircraft() member of Aircraft 2009-07-13 16:37:27 +00:00
smatz
98b8479f56 (svn r16813) -Codechange: make IsEngineCountable() member of Vehicle 2009-07-13 16:35:22 +00:00
rubidium
c5a44ce99e (svn r16736) -Codechange: give some station enums a name and use that instead of 'byte'. 2009-07-04 11:26:57 +00:00
smatz
93557ba4e9 (svn r16714) -Codechange: use pool-like accessors for Subsidy 2009-07-01 18:45:05 +00:00
smatz
d04750ff87 (svn r16711) -Codechange: use FOR_ALL_SUBSIDIES macro when iterating over all subsidies 2009-07-01 17:43:26 +00:00
rubidium
ff4326d6a3 (svn r16707) -Fix [FS#3007] (r16693): under some circumstances vehicles would skip loading as they thought nothing could be unloaded or loaded. 2009-07-01 09:50:52 +00:00
rubidium
e189037662 (svn r16706) -Fix (r16694): acquiring a subsidy resulted in an assertion. 2009-07-01 09:45:30 +00:00
rubidium
4f99508114 (svn r16694) -Fix [FS#2995] (rgradual loading, rnewindustries): only pay for whatever has been actually unloaded and perform the payment when unloading has finished. This fixes, amongst others:
* cheating by starting to unload and after getting paid rushing to the depot to get sold (or unloading, loading and getting paid again for the remainder)
 * cargo being dropped onto a station at the moment a stockpiling industry doesn't accept it anymore
 * industries getting cargo that has not been unloaded yet and subsequently dumping it back on the station in one go
Note: you will now get paid after the unloading has finished, so you'll have to wait a bit longer for 'your' money.
2009-06-29 19:55:36 +00:00
rubidium
025cf4b546 (svn r16693) -Fix [FS#3004] (r16883): cargo income was not added to the vehicle's profit. 2009-06-29 19:17:23 +00:00
rubidium
2c478d1b6d (svn r16683) -Codechange: move the cargo payment handling to a seperate class. Based on ideas of fonso/fonsinchen. 2009-06-28 15:12:59 +00:00
rubidium
e6ac18cd57 (svn r16682) -Codechange: make (static) industry list used to trigger the industries' production compile unit static instead of passing it around as pointer 2009-06-28 14:36:25 +00:00
rubidium
7f117cf256 (svn r16681) -Codechange: only resolve the company once for vehicle payment instead of each time a cargo packet is delivered 2009-06-28 14:33:10 +00:00
rubidium
5140f4261b (svn r16680) -Codechange: don't go through all the station unloading stuff when there is no vehicle at the station 2009-06-28 14:29:58 +00:00
smatz
72bee4ad2d (svn r16654) -Codechange: cache industries in station's coverage area instead of searching them everytime payment is made 2009-06-25 15:42:03 +00:00
smatz
f6a4d61cca (svn r16643) -Codechange: replace GetStationByTile() by Station::GetByTile() 2009-06-24 17:39:54 +00:00
smatz
a2567c84a0 (svn r16559) -Codechange: introduce Company::IsValidAiID() and Company::IsValidHumanID(), don't use IsHumanCompany() where possible 2009-06-10 22:05:01 +00:00
smatz
af85994f7f (svn r16527) -Codechange: use static member functions instead of simple casts when converting Vehicle to specialised vehicle types. Includes safety check 2009-06-06 16:54:22 +00:00
alberth
580e478e4e (svn r16491) -Codechange: Added parentheses around bitwise operators for code style. 2009-06-01 11:43:36 +00:00
yexo
e7a087b08b (svn r16453) -Fix: Move some code around so a company is no longer used after deleting it 2009-05-27 23:37:47 +00:00
frosch
eeb3f75cfe (svn r16416) -Fix [FS#2912]: Rework deleting of news when referenced vehicles/stations/industries are deleted. 2009-05-24 16:52:42 +00:00