82fc28f77f
(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
547677a782
(svn r17840) -Codechange: use the new pool's concepts (caching + not zeroing). Improves average CargoPacket con/destruction time by ~20%, MoveTo/Append by 5-10% and application performance by up to 2%.
2009-10-21 19:42:49 +00:00
a4d054eabc
(svn r17837) -Fix (r17812): comment erroneously mentioned feeder share
2009-10-21 10:05:22 +00:00
69b8e8e755
(svn r17836) -Codechange: split the CargoPacket constructor for creating 'real' new CargoPackets and saveload. For saveload we do not need to set anything except two variables (the rest is always overwritten by the load), for new 'real' cargo also pass the source_xy; dereferencing st before calling is easier than resolving st->index back to st and then dereferencing. Also don't set loaded_at_xy because that is of no importance when not loaded in a vehicle.
2009-10-20 22:24:34 +00:00
7f6d9d8c11
(svn r17814) -Codechange: there's no need to invalidate the cache in the constructor of a CargoList; the list is empty, the CargoList is calloc-ed so all caches are 0.
2009-10-19 15:36:35 +00:00
08ac51fada
(svn r17813) -Codechange: unify the CargoPacket related coding style
2009-10-19 09:15:47 +00:00
2cca30d2e3
(svn r17812) -Codechange: move the feeder_share cache from CargoList to VehicleCargoList; saves 512 bytes per station and 1-2% on CargoList::MoveTo.
2009-10-19 01:12:51 +00:00
fea06c5755
(svn r17809) -Fix: MSVC compilation.
2009-10-18 18:47:43 +00:00
e613107e02
(svn r17808) -Codechange: remove write 'access' from all of CargoPacket's variables
2009-10-18 17:53:34 +00:00
f11cebfe9b
(svn r17807) -Codechange: move all 'updates' just after the 'load' constructor of CargoPackets to the constructor call itself
2009-10-18 17:52:44 +00:00
4ad30fecde
(svn r17806) -Codechange: split CargoPacket's 'afterload' to a separate function
2009-10-18 17:47:38 +00:00
62a6e9509b
(svn r17804) -Codechange: move the CargoPacket 'invalidation' when stations get removed to CargoPacket.
2009-10-18 17:26:10 +00:00
f76de82679
(svn r17801) -Codechange: for StationCargoLists the 'loaded_at_xy' does not matter when merging CargoPackets
2009-10-18 14:30:37 +00:00
138e7233bc
(svn r17800) -Codechange: first steps into making CargoList a template
2009-10-18 14:28:26 +00:00
2e766884f6
(svn r17795) -Codechange: split cargolist into one for vehicles and one for stations.
2009-10-18 13:39:00 +00:00
c53682810f
(svn r17736) -Codechange [FS#3135]: rewrite CargoList::MoveTo; don't require the secondary list, use cache updates instead of rebuilds. This is usually faster because of primarily gradual loading that only moves a (small) part of the cargo each time. Based on patch by fonsinchen.
2009-10-07 08:31:42 +00:00
705615fd91
(svn r17735) -Codechange: update the cache one inserting/removing CargoPackets from the CargoList via Append/Truncate instead of rebuilding the whole cache. For Append this changes the O(n) cache rebuild into a O(1) cache update. For Truncate no temporary list is needed anymore (based on patch by fonsinchen)
2009-10-07 08:25:12 +00:00
446363aac4
(svn r17734) -Fix (r17732): broke the assumption that 'this->packets == this', which broke loading old savegames. Now remove the (need for the) hack that needed that assumption.
2009-10-06 23:01:35 +00:00
9b045ac7b2
(svn r17733) -Codechange: store the 'days in transit' cache as the sum of the days in transit instead of the average; the variable isn't requested that often (primarily station NewGRFs) that the dividing/testing for dividing by 0 step needs to be cached.
2009-10-06 21:24:03 +00:00
80f0df17ba
(svn r17732) -Codechange: reorder some variables of cargo packets/cargo lists to get better alignment *and* smaller structs; both from 40 bytes to 32 bytes on 64 bits.
2009-10-06 21:19:20 +00:00
d52fa73bb1
(svn r17731) -Codechange: do not cache a boolean which states whether some other variable is not 0.
2009-10-06 21:12:35 +00:00
31acc42b21
(svn r17730) -Codechange: do not cache the source of a packet in the cargo list. It's only used for (some) GUI/NewGRF purposes so precalculating it costs more than calculating when it's actually used.
2009-10-06 21:06:26 +00:00
1e2dc25582
(svn r17727) -Codechange: some coding style and documentation fixes
2009-10-06 19:52:27 +00:00
e0e5eae1ee
(svn r17721) -Codechange: replace a magic number with a constant
2009-10-06 17:28:06 +00:00
5f59d0c5b4
(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
e8ddf001c8
(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
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
2009-08-21 20:21:05 +00:00
2a430d981f
(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
985608c713
(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
b178a94c19
(svn r16459) -Codechange: move definition of several cargopacket accessors to header file
2009-05-29 15:46:55 +00:00
56a7b70591
(svn r16380) -Codechange: rename pool.hpp to pool_type.hpp
2009-05-22 15:39:22 +00:00
62a7948af0
(svn r16378) -Codechange: replace OldPool with simpler Pool. Compilation time, binary size and run time (with asserts disabled) should be improved
2009-05-22 15:13:50 +00:00
04723b240e
(svn r16377) -Codechange: unify FOR_ALL_* macros, use separate index variable instead of var->index
2009-05-22 14:23:36 +00:00
570af0ce44
(svn r16338) -Codechange: split loading of references to two phases
...
In the first phase, indexes are stored. In the second phase, indexes are checked for validity and converted to pointers
2009-05-17 16:28:29 +00:00
ed1e54bd84
(svn r16326) -Codechange: replace GetPoolItemPoolSize() by PoolItem::GetPoolSize()
2009-05-16 23:44:36 +00:00
6221d74644
(svn r16325) -Codechange: replace GetPoolItem(index) by PoolItem::Get(index)
2009-05-16 23:34:14 +00:00
7e8c7dfcbf
(svn r14137) -Codechange: Remove a now unused member of CargoPacket
2008-08-23 09:31:53 +00:00
c98c3122b5
(svn r14101) -Cleanup (r14083): leftover friend.
2008-08-18 21:44:03 +00:00
d03994098b
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
2008-05-06 15:11:33 +00:00
dbf6e344a4
(svn r12940) -Fix [FS#1974](r12913): [autoreplace] a vehicle backup should include the cargo packets in the vehicle as well
2008-05-04 10:05:35 +00:00
cea98ea0e6
(svn r12815) -Codechange: reshuffle some variables in the CargoPacket struct saving 4 of 36 bytes with a 32 bit compiler and 8 of 48 bytes on 64 bit compiler per cargo packets. There are generally more cargopackets in game than vehicles.
2008-04-21 09:20:42 +00:00
2edd403656
(svn r12489) -Codechange: split station.h into station_base.h and station_func.h.
2008-03-31 00:06:17 +00:00
58e6e75320
(svn r12468) -Codechange: move some type related stuff from station.h (and openttd.h) to station_type.h.
2008-03-28 16:33:28 +00:00
592e22cc3a
(svn r12120) -Cleanup: const-ify parameters when checking for same cargopacket source.
2008-02-12 11:46:29 +00:00
b7f50533c2
(svn r11914) -Documentation: fix some @file statement
2008-01-18 03:48:29 +00:00
6c954cad5f
(svn r11801) -Codechange: remove some unneeded includes from some header files.
2008-01-09 21:27:39 +00:00
6a9e77e079
(svn r11680) -Codechange: refactor more out of openttd.h and functions.h.
2007-12-21 22:50:51 +00:00
8a6cc3aa10
(svn r11009) -Codechange: unvirtualise IsValid as that isn't needed with templates. This gives up to 10% performance increase in games with lots of vehicles.
2007-08-30 20:40:33 +00:00
ac5fde61fb
(svn r11002) -Codechange: unhackify the cargo packet list saving (a little).
2007-08-30 12:10:32 +00:00
cab6275511
(svn r10749) -Codechange: use the generic pool item class as super class for cargo packets, which results in a nice reduction of code duplication.
2007-08-02 10:49:24 +00:00
435d39f8fb
(svn r10743) -Fix: some typos introduces by copy-pasting.
2007-08-01 19:13:42 +00:00
67f46b40ab
(svn r10358) -Codechange: remove the cargopacket leakchecker as it never asserted in almost a week of stresstesting, so I'm pretty sure all cornercases are tested by now.
2007-06-27 17:19:05 +00:00
e5c352818d
(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.
2007-06-22 11:58:59 +00:00
rubidium