diff options
| -rw-r--r-- | src/cargopacket.cpp | 4 | ||||
| -rw-r--r-- | src/cargopacket.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp index b316b0297..dca6103e2 100644 --- a/src/cargopacket.cpp +++ b/src/cargopacket.cpp @@ -21,9 +21,9 @@ static void CargoPacketPoolNewBlock(uint cpart_item) for (CargoPacket *cp = GetCargoPacket(cpart_item); cp != NULL; cp = (cp->index + 1U < GetCargoPacketPoolSize()) ? GetCargoPacket(cp->index + 1U) : NULL) cp->index = cpart_item++; } -static void CargoPacketPoolCleanBlock(uint cpart_item, uint end_item) +static void CargoPacketPoolCleanBlock(uint start_item, uint end_item) { - for (uint i = cpart_item; i <= end_item; i++) { + for (uint i = start_item; i <= end_item; i++) { CargoPacket *cp = GetCargoPacket(i); if (cp->IsValid()) cp->~CargoPacket(); } diff --git a/src/cargopacket.h b/src/cargopacket.h index 0ba54fa2c..4f653e225 100644 --- a/src/cargopacket.h +++ b/src/cargopacket.h @@ -51,12 +51,12 @@ struct CargoPacket { bool SameSource(CargoPacket *cp); - /* normal new/delete operators. Used when building/removing station */ - void* operator new (size_t size); + /* normal new/delete operators. Used when building/removing cargo packet */ + void *operator new (size_t size); void operator delete(void *p); - /* new/delete operators accepting station index. Used when loading station from savegame. */ - void* operator new (size_t size, CargoPacket::ID cp_idx); + /* new/delete operators accepting cargo packet index. Used when loading cargo packets from savegame. */ + void *operator new (size_t size, CargoPacket::ID cp_idx); void operator delete(void *p, CargoPacket::ID cp_idx); private: |