Files
@ r7596:afd285ff90bb
Branch filter:
Location: cpp/openttd-patchpack/source/src/cargopacket.cpp - annotation
r7596:afd285ff90bb
5.9 KiB
text/x-c
(svn r11123) -Update: WebTranslator2 update to 2007-09-17 12:45:29
afrikaans - 47 fixed, 52 changed by TrueTenacity (99)
brazilian_portuguese - 23 changed by fukumori (23)
bulgarian - 14 fixed by thetitan (14)
catalan - 3 changed by arnaullv (3)
croatian - 6 fixed, 12 changed by knovak (15), tperic (3)
danish - 20 fixed by ThomasA (20)
finnish - 20 fixed by habazi (20)
german - 10 fixed by Timwi (10)
hungarian - 1 fixed by miham (1)
italian - 1 fixed by lorenzodv (1)
japanese - 6 fixed by ickoonite (6)
norwegian_nynorsk - 6 fixed by pollux (6)
piglatin - 20 fixed by adammw (20)
russian - 20 fixed by Smoky555 (20)
slovak - 1 fixed by lengyel (1)
slovenian - 7 fixed by Necrolyte (7)
spanish - 1 changed by Cabu (1)
traditional_chinese - 21 fixed by xbddc (21)
afrikaans - 47 fixed, 52 changed by TrueTenacity (99)
brazilian_portuguese - 23 changed by fukumori (23)
bulgarian - 14 fixed by thetitan (14)
catalan - 3 changed by arnaullv (3)
croatian - 6 fixed, 12 changed by knovak (15), tperic (3)
danish - 20 fixed by ThomasA (20)
finnish - 20 fixed by habazi (20)
german - 10 fixed by Timwi (10)
hungarian - 1 fixed by miham (1)
italian - 1 fixed by lorenzodv (1)
japanese - 6 fixed by ickoonite (6)
norwegian_nynorsk - 6 fixed by pollux (6)
piglatin - 20 fixed by adammw (20)
russian - 20 fixed by Smoky555 (20)
slovak - 1 fixed by lengyel (1)
slovenian - 7 fixed by Necrolyte (7)
spanish - 1 changed by Cabu (1)
traditional_chinese - 21 fixed by xbddc (21)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 | r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7380:61767264770c r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7380:61767264770c r7380:61767264770c r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7380:61767264770c r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7130:1067231b5536 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 r7010:fd8e3ec6f727 | /* $Id$ */
/** @file cargopacket.cpp Implementation of the cargo packets */
#include "stdafx.h"
#include "openttd.h"
#include "station.h"
#include "cargopacket.h"
#include "saveload.h"
/* Initialize the cargopacket-pool */
DEFINE_OLD_POOL_GENERIC(CargoPacket, CargoPacket)
void InitializeCargoPackets()
{
/* Clean the cargo packet pool and create 1 block in it */
_CargoPacket_pool.CleanPool();
_CargoPacket_pool.AddBlockToPool();
}
CargoPacket::CargoPacket(StationID source, uint16 count)
{
if (source != INVALID_STATION) assert(count != 0);
this->source = source;
this->source_xy = (source != INVALID_STATION) ? GetStation(source)->xy : 0;
this->loaded_at_xy = this->source_xy;
this->count = count;
this->days_in_transit = 0;
this->feeder_share = 0;
this->paid_for = false;
}
CargoPacket::~CargoPacket()
{
this->count = 0;
}
bool CargoPacket::SameSource(CargoPacket *cp)
{
return this->source_xy == cp->source_xy && this->days_in_transit == cp->days_in_transit && this->paid_for == cp->paid_for;
}
static const SaveLoad _cargopacket_desc[] = {
SLE_VAR(CargoPacket, source, SLE_UINT16),
SLE_VAR(CargoPacket, source_xy, SLE_UINT32),
SLE_VAR(CargoPacket, loaded_at_xy, SLE_UINT32),
SLE_VAR(CargoPacket, count, SLE_UINT16),
SLE_VAR(CargoPacket, days_in_transit, SLE_UINT8),
SLE_VAR(CargoPacket, feeder_share, SLE_INT64),
SLE_VAR(CargoPacket, paid_for, SLE_BOOL),
SLE_END()
};
static void Save_CAPA()
{
CargoPacket *cp;
FOR_ALL_CARGOPACKETS(cp) {
SlSetArrayIndex(cp->index);
SlObject(cp, _cargopacket_desc);
}
}
static void Load_CAPA()
{
int index;
while ((index = SlIterateArray()) != -1) {
CargoPacket *cp = new (index) CargoPacket();
SlObject(cp, _cargopacket_desc);
}
}
extern const ChunkHandler _cargopacket_chunk_handlers[] = {
{ 'CAPA', Save_CAPA, Load_CAPA, CH_ARRAY | CH_LAST},
};
/*
*
* Cargo list implementation
*
*/
CargoList::~CargoList()
{
while (!packets.empty()) {
delete packets.front();
packets.pop_front();
}
}
const CargoList::List *CargoList::Packets() const
{
return &packets;
}
void CargoList::AgeCargo()
{
if (empty) return;
uint dit = 0;
for (List::const_iterator it = packets.begin(); it != packets.end(); it++) {
if ((*it)->days_in_transit != 0xFF) (*it)->days_in_transit++;
dit += (*it)->days_in_transit * (*it)->count;
}
days_in_transit = dit / count;
}
bool CargoList::Empty() const
{
return empty;
}
uint CargoList::Count() const
{
return count;
}
bool CargoList::UnpaidCargo() const
{
return unpaid_cargo;
}
Money CargoList::FeederShare() const
{
return feeder_share;
}
StationID CargoList::Source() const
{
return source;
}
uint CargoList::DaysInTransit() const
{
return days_in_transit;
}
void CargoList::Append(CargoPacket *cp)
{
assert(cp != NULL);
assert(cp->IsValid());
for (List::iterator it = packets.begin(); it != packets.end(); it++) {
if ((*it)->SameSource(cp) && (*it)->count + cp->count <= 65535) {
(*it)->count += cp->count;
(*it)->feeder_share += cp->feeder_share;
delete cp;
InvalidateCache();
return;
}
}
/* The packet could not be merged with another one */
packets.push_back(cp);
InvalidateCache();
}
void CargoList::Truncate(uint count)
{
for (List::iterator it = packets.begin(); it != packets.end(); it++) {
uint local_count = (*it)->count;
if (local_count <= count) {
count -= local_count;
continue;
}
(*it)->count = count;
count = 0;
}
while (!packets.empty()) {
CargoPacket *cp = packets.back();
if (cp->count != 0) break;
delete cp;
packets.pop_back();
}
InvalidateCache();
}
bool CargoList::MoveTo(CargoList *dest, uint count, CargoList::MoveToAction mta, uint data)
{
assert(mta == MTA_FINAL_DELIVERY || dest != NULL);
CargoList tmp;
while (!packets.empty() && count > 0) {
CargoPacket *cp = *packets.begin();
if (cp->count <= count) {
/* Can move the complete packet */
packets.remove(cp);
switch (mta) {
case MTA_FINAL_DELIVERY:
if (cp->source == data) {
tmp.Append(cp);
} else {
count -= cp->count;
delete cp;
}
break;
case MTA_CARGO_LOAD:
cp->loaded_at_xy = data;
/* When cargo is moved into another vehicle you have *always* paid for it */
cp->paid_for = false;
/* FALL THROUGH */
case MTA_OTHER:
count -= cp->count;
dest->packets.push_back(cp);
break;
}
} else {
/* Can move only part of the packet, so split it into two pieces */
if (mta != MTA_FINAL_DELIVERY) {
CargoPacket *cp_new = new CargoPacket();
cp_new->source = cp->source;
cp_new->source_xy = cp->source_xy;
cp_new->loaded_at_xy = (mta == MTA_CARGO_LOAD) ? data : cp->loaded_at_xy;
cp_new->days_in_transit = cp->days_in_transit;
cp_new->feeder_share = cp->feeder_share / count;
/* When cargo is moved into another vehicle you have *always* paid for it */
cp_new->paid_for = (mta == MTA_CARGO_LOAD) ? false : cp->paid_for;
cp_new->count = count;
dest->packets.push_back(cp_new);
cp->feeder_share /= cp->count - count;
}
cp->count -= count;
count = 0;
}
}
bool remaining = !packets.empty();
if (mta == MTA_FINAL_DELIVERY && !tmp.Empty()) {
/* There are some packets that could not be delivered at the station, put them back */
tmp.MoveTo(this, MAX_UVALUE(uint));
tmp.packets.clear();
}
if (dest != NULL) dest->InvalidateCache();
InvalidateCache();
return remaining;
}
void CargoList::InvalidateCache()
{
empty = packets.empty();
count = 0;
unpaid_cargo = false;
feeder_share = 0;
source = INVALID_STATION;
days_in_transit = 0;
if (empty) return;
uint dit = 0;
for (List::const_iterator it = packets.begin(); it != packets.end(); it++) {
count += (*it)->count;
unpaid_cargo |= !(*it)->paid_for;
dit += (*it)->days_in_transit * (*it)->count;
feeder_share += (*it)->feeder_share;
}
days_in_transit = dit / count;
source = (*packets.begin())->source;
}
|