diff options
| author | frosch <frosch@openttd.org> | 2009-10-18 18:47:43 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2009-10-18 18:47:43 +0000 |
| commit | fea06c575532d1070dc67e49453872601f97f84a (patch) | |
| tree | f368f144650d096e18efbf8cdec44337c0925777 | |
| parent | e613107e02c5eb99532452811e8b9341199ceb29 (diff) | |
| download | openttd-fea06c575532d1070dc67e49453872601f97f84a.tar.xz | |
(svn r17809) -Fix: MSVC compilation.
| -rw-r--r-- | src/cargopacket.cpp | 2 | ||||
| -rw-r--r-- | src/cargopacket.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp index 12e7dde29..6c93fc1c9 100644 --- a/src/cargopacket.cpp +++ b/src/cargopacket.cpp @@ -171,7 +171,7 @@ void CargoList<Tinst>::Truncate(uint max_remaining) template <class Tinst> template <class Tother_inst> -bool CargoList<Tinst>::MoveTo(Tother_inst *dest, uint max_move, CargoList::MoveToAction mta, CargoPayment *payment, uint data) +bool CargoList<Tinst>::MoveTo(Tother_inst *dest, uint max_move, MoveToAction mta, CargoPayment *payment, uint data) { assert(mta == MTA_FINAL_DELIVERY || dest != NULL); assert(mta == MTA_UNLOAD || mta == MTA_CARGO_LOAD || payment != NULL); diff --git a/src/cargopacket.h b/src/cargopacket.h index 471f7a7d0..2d5c824e9 100644 --- a/src/cargopacket.h +++ b/src/cargopacket.h @@ -316,7 +316,7 @@ public: * @return true if there are still packets that might be moved from this cargo list */ template <class Tother_inst> - bool MoveTo(Tother_inst *dest, uint count, CargoList::MoveToAction mta, CargoPayment *payment, uint data = 0); + bool MoveTo(Tother_inst *dest, uint count, MoveToAction mta, CargoPayment *payment, uint data = 0); /** Invalidates the cached data and rebuild it */ void InvalidateCache(); |