Mercurial > hg > openttd
changeset 13300:84f45cafda07 draft
(svn r17809) -Fix: MSVC compilation.
| author | frosch <frosch@openttd.org> |
|---|---|
| date | Sun, 18 Oct 2009 18:47:43 +0000 |
| parents | 366acecbae41 |
| children | ac89dbd27f78 |
| files | src/cargopacket.cpp src/cargopacket.h |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cargopacket.cpp +++ b/src/cargopacket.cpp @@ -171,7 +171,7 @@ 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);
--- a/src/cargopacket.h +++ b/src/cargopacket.h @@ -316,7 +316,7 @@ * @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();