summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-08-01 19:13:42 +0000
committerrubidium <rubidium@openttd.org>2007-08-01 19:13:42 +0000
commit435d39f8fb5c2e3a40e6e0c7344ba4b1531a6844 (patch)
tree12aaebec305a748f0307963fc177986a544dd092 /src
parentc693a57499bc129c1c6ee23a6684d3ad4cceeb14 (diff)
downloadopenttd-435d39f8fb5c2e3a40e6e0c7344ba4b1531a6844.tar.xz
(svn r10743) -Fix: some typos introduces by copy-pasting.
Diffstat (limited to 'src')
-rw-r--r--src/cargopacket.cpp4
-rw-r--r--src/cargopacket.h8
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: